Revert "openthread-br: new package"

The PR to add openthread-br in master isn't merged yet, as it has draft
status. This was merged prematurely. Revert.

This reverts commit 27dd30aadb.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

.circleci/Dockerfile

@@ -9,7 +9,6 @@ FROM debian:10
 # v1.0.4 - Add support for Python3
 # v1.0.5 - Add 19.07 public keys, verify keys
 # v1.0.6 - Add 21.02 public keys, update Debian image to version 10, add rsync
-# v1.0.7 - Add 22.03 public keys, 18.06 v2 gpg key, 18.06 usign key
 
 RUN apt update && apt install -y \
 build-essential \
@@ -52,11 +51,6 @@ RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/17E1CE16.asc
  && gpg --fingerprint --with-colons '<openwrt-devel@lists.openwrt.org>' | grep '^fpr:::::::::6768C55E79B032D77A28DA5F0F20257417E1CE16:$' \
  && echo '6768C55E79B032D77A28DA5F0F20257417E1CE16:6:' | gpg --import-ownertrust
 
-# OpenWrt Build System (PGP key for 18.06 release builds)
-RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/15807931.asc' | gpg --import \
- && gpg --fingerprint --with-colons '<pgpsign-18.06@openwrt.org>' | grep '^fpr:::::::::AD0507363D2BCE9C9E36CEC4FBCB78F015807931:$' \
- && echo 'AD0507363D2BCE9C9E36CEC4FBCB78F015807931:6:' | gpg --import-ownertrust
-
 # OpenWrt Build System (PGP key for 19.07 release builds)
 RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/2074BE7A.asc' | gpg --import \
  && gpg --fingerprint --with-colons '<pgpsign-19.07@openwrt.org>' | grep '^fpr:::::::::D9C6901F45C9B86858687DFF28A39BC32074BE7A:$' \
@@ -67,27 +61,13 @@ RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/88CA59E8.asc
  && gpg --fingerprint --with-colons '<pgpsign-21.02@openwrt.org>' | grep '^fpr:::::::::667205E379BAF348863A5C6688CA59E88F681580:$' \
  && echo '667205E379BAF348863A5C6688CA59E88F681580:6:' | gpg --import-ownertrust
 
-# OpenWrt Build System (GnuPGP key for 22.03 release builds)
-RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/CD54E82DADB3684D.asc' | gpg --import \
- && gpg --fingerprint --with-colons '<pgpsign-22.03@openwrt.org>' | grep '^fpr:::::::::BF856781A01293C8409ABE72CD54E82DADB3684D:$' \
- && echo 'BF856781A01293C8409ABE72CD54E82DADB3684D:6:' | gpg --import-ownertrust
-
 # untrusted comment: Public usign key for unattended snapshot builds
 RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/b5043e70f9a75cde' --create-dirs -o /home/build/usign/b5043e70f9a75cde \
  && echo 'd7ac10f9ed1b38033855f3d27c9327d558444fca804c685b17d9dcfb0648228f */home/build/usign/b5043e70f9a75cde' | sha256sum --check
 
-# untrusted comment: Public usign key for 18.06 release builds
-RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/1035ac73cc4e59e3' --create-dirs -o /home/build/usign/1035ac73cc4e59e3 \
- && echo '8dc2e7f5c4e634437e6641f4df77a18bf59f0c8e9016c8ba4be5d4a0111e68c2 */home/build/usign/1035ac73cc4e59e3' | sha256sum --check
-
 # untrusted comment: Public usign key for 19.07 release builds
 RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/f94b9dd6febac963' --create-dirs -o /home/build/usign/f94b9dd6febac963 \
  && echo 'b1d09457cfbc36fccfe18382d65c54a2ade3e7fd3902da490a53aa517b512755 */home/build/usign/f94b9dd6febac963' | sha256sum --check
 
 # untrusted comment: Public usign key for 21.02 release builds
-RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/2f8b0b98e08306bf' --create-dirs -o /home/build/usign/2f8b0b98e08306bf \
- && echo 'd102bdd75421c62490b97f520f9db06aadb44ad408b244755d26e96ea5cd3b7f */home/build/usign/2f8b0b98e08306bf' | sha256sum --check
-
-# untrusted comment: Public usign key for 22.03 release builds
-RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/4d017e6f1ed5d616' --create-dirs -o /home/build/usign/4d017e6f1ed5d616 \
- && echo 'f3c5fdf447d7c2743442e68077d60acc7c3e91754849e1f4b6be837b4204b7e2 */home/build/usign/4d017e6f1ed5d616' | sha256sum --check
+RUN curl 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=usign/2f8b0b98e08306bf' --create-dirs -o /home/build/usign/2f8b0b98e08306bf  && echo 'd102bdd75421c62490b97f520f9db06aadb44ad408b244755d26e96ea5cd3b7f */home/build/usign/2f8b0b98e08306bf' | sha256sum --check

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: docker.io/openwrtorg/packages-cci:v1.0.7
+      - image: docker.io/openwrtorg/packages-cci:v1.0.6
     environment:
       - SDK_HOST: "downloads.openwrt.org"
       - SDK_PATH: "snapshots/targets/ath79/generic"

.github/issue_template

@@ -12,5 +12,5 @@ Environment: (put here arch, model, OpenWrt version)
 Description:
 
 ```
-Format code blocks by wrapping them with pairs of ```
+Formating code blocks by wrapping them with pairs of ```
 ```

.github/workflows/check-autorelease-deprecation.yml

@@ -1,91 +0,0 @@
-name: Check autorelease deprecation
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, converted_to_draft, ready_for_review, edited]
-
-jobs:
-  build:
-    name: Check autorelease deprecation
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-
-    permissions:
-      pull-requests: write
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Determine branch name
-        run: |
-          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
-          echo "Building for $BRANCH"
-          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
-
-      - name: Determine changed packages
-        run: |
-          RET=0
-
-          # only detect packages with changes
-          PKG_ROOTS=$(find . -name Makefile | \
-            grep -v ".*/src/Makefile" | \
-            sed -e 's@./\(.*\)/Makefile@\1/@')
-          CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
-
-          for ROOT in $PKG_ROOTS; do
-            for CHANGE in $CHANGES; do
-              if [[ "$CHANGE" == "$ROOT"* ]]; then
-                if grep -q '$(AUTORELEASE)' "$ROOT/Makefile"; then
-                  CONTAINS_AUTORELEASE+="$ROOT"
-                fi
-                break
-              fi
-            done
-          done
-
-          if [ -n "$CONTAINS_AUTORELEASE" ]; then
-            RET=1
-            cat > "$GITHUB_WORKSPACE/pr_comment.md" << EOF
-          Please do no longer set *PKG_RELEASE* to *AUTORELEASE* as the
-          feature is deprecated. Please use an integer instead. Below is a
-          list of affected packages including correct *PKG_RELEASE*:
-
-          EOF
-          fi
-
-          for ROOT in $CONTAINS_AUTORELEASE; do
-            echo -n "  - ${ROOT}Makefile: PKG_RELEASE:=" >> "$GITHUB_WORKSPACE/pr_comment.md"
-            last_bump="$(git log --pretty=format:'%h %s' "$ROOT" |
-              grep --max-count=1 -e ': [uU]pdate to ' -e ': [bB]ump to ' |
-              cut -f 1 -d ' ')"
-
-            if [ -n "$last_bump" ]; then
-              echo -n $(($(git rev-list --count "$last_bump..HEAD" "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
-            else
-              echo -n $(($(git rev-list --count HEAD "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
-            fi
-            echo >> "$GITHUB_WORKSPACE/pr_comment.md"
-          done
-
-          exit $RET
-
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        if: ${{ failure() }}
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-
-      - name: Create or update comment
-        uses: peter-evans/create-or-update-comment@v2
-        if: ${{ failure() }}
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body-file: 'pr_comment.md'
-          edit-mode: replace

.github/workflows/entrypoint.sh

@@ -1,70 +1,39 @@
 #!/bin/sh
 
-# not enabling `errtrace` and `pipefail` since those are bash specific
-set -o errexit # failing commands causes script to fail
-set -o nounset # undefined variables causes script to fail
-
-echo "src/gz packages_ci file:///ci" >> /etc/opkg/distfeeds.conf
-
-FINGERPRINT="$(usign -F -p /ci/packages_ci.pub)"
-cp /ci/packages_ci.pub "/etc/opkg/keys/$FINGERPRINT"
-
 mkdir -p /var/lock/
 
 opkg update
 
-export CI_HELPER="/ci/.github/workflows/ci_helpers.sh"
+[ -n "$CI_HELPER" ] || CI_HELPER="/ci/.github/workflows/ci_helpers.sh"
 
 for PKG in /ci/*.ipk; do
-	tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control
+	tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control 
 	# package name including variant
 	PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control)
 	# package version without release
-	PKG_VERSION=$(sed -ne 's#^Version: \(.*\)$#\1#p' ./control)
-	PKG_VERSION="${PKG_VERSION%-[!-]*}"
-	# package source containing test.sh script
-	PKG_SOURCE=$(sed -ne 's#^Source: \(.*\)$#\1#p' ./control)
-	PKG_SOURCE="${PKG_SOURCE#/feed/}"
+	PKG_VERSION=$(sed -ne 's#^Version: \(.*\)-[0-9]*$#\1#p' ./control)
+	# package source contianing test.sh script
+	PKG_SOURCE=$(sed -ne 's#^Source: .*/\(.*\)$#\1#p' ./control)
 
-	echo
 	echo "Testing package $PKG_NAME in version $PKG_VERSION from $PKG_SOURCE"
 
-	if ! [ -d "/ci/$PKG_SOURCE" ]; then
-		echo "$PKG_SOURCE is not a directory"
-		exit 1
-	fi
-
-	PRE_TEST_SCRIPT="/ci/$PKG_SOURCE/pre-test.sh"
-	TEST_SCRIPT="/ci/$PKG_SOURCE/test.sh"
-
-	if ! [ -f "$TEST_SCRIPT" ]; then
-		echo "No test.sh script available"
-		continue
-	fi
-
-	export PKG_NAME PKG_VERSION
-
-	if [ -f "$PRE_TEST_SCRIPT" ]; then
-		echo "Use package specific pre-test.sh"
-		if sh "$PRE_TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
-			echo "Pre-test successful"
-		else
-			echo "Pre-test failed"
-			exit 1
-		fi
-	else
-		echo "No pre-test.sh script available"
-	fi
-
 	opkg install "$PKG"
 
-	echo "Use package specific test.sh"
-	if sh "$TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
-		echo "Test successful"
+	export PKG_NAME PKG_VERSION CI_HELPER
+
+	TEST_SCRIPT=$(find /ci/ -name "$PKG_SOURCE" -type d)/test.sh
+
+	if [ -f "$TEST_SCRIPT" ]; then
+		echo "Use package specific test.sh"
+		if sh "$TEST_SCRIPT" "$PKG_NAME" "$PKG_VERSION"; then
+			echo "Test successful"
+		else
+			echo "Test failed"
+			exit 1
+		fi
 	else
-		echo "Test failed"
-		exit 1
+		echo "No test.sh script available"
 	fi
 
-	opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove --autoremove || true
+	opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove
 done

.github/workflows/formal.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -34,8 +34,16 @@ jobs:
               RET=1
             fi
 
+            author="$(git show -s --format=%aN $commit)"
+            if echo $author | grep -q '\S\+\s\+\S\+'; then
+              success "Author name ($author) seems ok"
+            else
+              err "Author name ($author) need to be your real name 'firstname lastname'"
+              RET=1
+            fi
+
             subject="$(git show -s --format=%s $commit)"
-            if echo "$subject" | grep -q -e '^[0-9A-Za-z,+/_-]\+: ' -e '^Revert ' -e '^CONTRIBUTING.md' -e '^README.md'; then
+            if echo "$subject" | grep -q -e '^[0-9A-Za-z,+/_-]\+: ' -e '^Revert '; then
               success "Commit subject line seems ok ($subject)"
             else
               err "Commit subject line MUST start with '<package name>: ' ($subject)"

.github/workflows/multi-arch-test-build.yml

@@ -3,10 +3,6 @@ name: Test Build
 on:
   pull_request:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
   build:
     name: Test ${{ matrix.arch }}
@@ -15,25 +11,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - arch: aarch64_generic
-            target: armsr-armv8
-            runtime_test: true
-
-          - arch: arm_cortex-a15_neon-vfpv4
-            target: armsr-armv7
-            runtime_test: true
+          - arch: arc_archs
+            target: archs38-generic
+            runtime_test: false
 
           - arch: arm_cortex-a9_vfpv3-d16
             target: mvebu-cortexa9
             runtime_test: false
 
-          - arch: i386_pentium-mmx
-            target: x86-geode
-            runtime_test: true
-
           - arch: mips_24kc
             target: ath79-generic
-            runtime_test: true
+            runtime_test: false
 
           - arch: mipsel_24kc
             target: mt7621
@@ -43,20 +31,28 @@ jobs:
             target: apm821xx-nand
             runtime_test: false
 
-          - arch: powerpc_8548
+          - arch: powerpc_8540
             target: mpc85xx-p1010
             runtime_test: false
 
-          - arch: riscv64_riscv64
-            target: sifiveu-generic
-            runtime_test: false
+          - arch: aarch64_cortex-a53
+            target: mvebu-cortexa53
+            runtime_test: true
+
+          - arch: arm_cortex-a15_neon-vfpv4
+            target: armvirt-32
+            runtime_test: true
+
+          - arch: i386_pentium-mmx
+            target: x86-geode
+            runtime_test: true
 
           - arch: x86_64
             target: x86-64
             runtime_test: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
@@ -90,31 +86,16 @@ jobs:
           echo "Building $PACKAGES"
           echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
 
-      - name: Generate build keys
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y signify-openbsd
-          signify-openbsd -G -n -c 'DO NOT USE - OpenWrt packages feed CI' -p packages_ci.pub -s packages_ci.sec
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "KEY_BUILD<<$EOF" >> $GITHUB_ENV
-          cat packages_ci.sec >> $GITHUB_ENV
-          echo "$EOF" >> $GITHUB_ENV
-
       - name: Build
-        uses: openwrt/gh-action-sdk@v7
+        uses: openwrt/gh-action-sdk@v4
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
           FEEDNAME: packages_ci
-          INDEX: 1
-          KEY_BUILD: ${{ env.KEY_BUILD }}
-          V: s
 
       - name: Move created packages to project dir
-        if: always()
-        run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true
+        run: cp bin/packages/${{ matrix.arch }}/packages_ci/*.ipk . || true
 
       - name: Collect metadata
-        if: always()
         run: |
           MERGE_ID=$(git rev-parse --short HEAD)
           echo "MERGE_ID=$MERGE_ID" >> $GITHUB_ENV
@@ -125,7 +106,6 @@ jobs:
           echo "ARCHIVE_NAME=${{matrix.arch}}-PR$PRNUMBER-$MERGE_ID" >> $GITHUB_ENV
 
       - name: Generate metadata
-        if: always()
         run: |
           cat << _EOF_ > PKG-INFO
           Metadata-Version: 2.1
@@ -152,19 +132,15 @@ jobs:
           cat PKG-INFO
 
       - name: Store packages
-        if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{env.ARCHIVE_NAME}}-packages
           path: |
-            Packages
-            Packages.*
             *.ipk
             PKG-INFO
 
       - name: Store logs
-        if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{env.ARCHIVE_NAME}}-logs
           path: |
@@ -172,35 +148,21 @@ jobs:
             PKG-INFO
 
       - name: Remove logs
-        if: always()
         run: sudo rm -rf logs/ || true
 
-      - name: Check if any packages were built
-        run: |
-          if [ -n "$(find . -maxdepth 1 -type f -name '*.ipk' -print -quit)" ]; then
-            echo "Found *.ipk files"
-            HAVE_IPKS=true
-          else
-            echo "No *.ipk files found"
-            HAVE_IPKS=false
-          fi
-          echo "HAVE_IPKS=$HAVE_IPKS" >> $GITHUB_ENV
-
       - name: Register QEMU
-        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
+        if: ${{ matrix.runtime_test }}
         run: |
-          sudo apt-get update
-          sudo apt-get install -y qemu-user-static binfmt-support
-          sudo update-binfmts --import
+          sudo docker run --rm --privileged aptman/qus -s -- -p
 
       - name: Build Docker container
-        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
+        if: ${{ matrix.runtime_test }}
         run: |
           docker build -t test-container --build-arg ARCH .github/workflows/
         env:
           ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
 
       - name: Test via Docker container
-        if: ${{ matrix.runtime_test && fromJSON(env.HAVE_IPKS) }}
+        if: ${{ matrix.runtime_test }}
         run: |
           docker run --rm -v $GITHUB_WORKSPACE:/ci test-container

CONTRIBUTING.md

@@ -200,9 +200,9 @@ checking if `foobar --version` prints the correct version. `PKG_VERSION` is the
 OpenWrt version and therefore includes the `PKG_RELEASE`, which isn't usually
 part of the running programs version.
 
-The following snippet shows a script that tests different binaries depending on
+The following snippet show a script that tests different binaries, depending
 what IPK package was installed. The `gpsd` Makefile produces both a `gpsd` and
-a `gpsd-clients` IPK packages.
+a `gpsd-clients` IPK package.
 
 ```shell
  #!/bin/sh

admin/bottom/Makefile

@@ -1,39 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2023 Luca Barbato
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bottom
-PKG_VERSION:=0.9.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/ClementTsang/bottom/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=199123ef354bcabaa8a2e3b7b477b324f5b647d503a2599d08296733846eea6e
-
-PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=rust/host
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include ../../lang/rust/rust-package.mk
-
-define Package/bottom
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Interactive processes viewer
-  DEPENDS:=$(RUST_ARCH_DEPENDS)
-  URL:=https://github.com/ClementTsang/bottom
-endef
-
-define Package/bottom/description
-  A customizable cross-platform graphical process/system monitor
-  for the terminal.
-endef
-
-$(eval $(call RustBinPackage,bottom))
-$(eval $(call BuildPackage,bottom))

admin/btop/Makefile

@@ -1,55 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=btop
-PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL=https://codeload.github.com/aristocratos/btop/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=375e078ce2091969f0cd14030620bd1a94987451cf7a73859127a786006a32cf
-
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_FLAGS:=no-lto
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/btop
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=A monitor of resources
-  URL:=https://github.com/aristocratos/btop
-  DEPENDS:=+libstdcpp
-endef
-
-define Package/btop/description
-  Resource monitor that shows usage and stats for processor, memory,
-  disks, network and processes.
-
-  C++ version and continuation of bashtop and bpytop.
-endef
-
-MAKE_FLAGS+= \
-	PLATFORM=Linux \
-	OPTFLAGS="$(TARGET_CXXFLAGS)" \
-	LDCXXFLAGS="$(TARGET_LDFLAGS) -pthread"
-
-ifneq ($(CONFIG_USE_MUSL),)
-  TARGET_CFLAGS += -D_LARGEFILE64_SOURCE
-endif
-
-define Package/btop/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/btop $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/local/share/btop $(1)/usr/share/
-
-	$(INSTALL_DIR) $(1)/etc/profile.d
-	$(CP) $(CURDIR)/files/btop.sh $(1)/etc/profile.d/
-endef
-
-$(eval $(call BuildPackage,btop))

admin/btop/files/btop.sh

@@ -1 +0,0 @@
-alias btop="btop --utf-force"

admin/btop/test.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-btop --version | grep "$PKG_VERSION"

admin/debian-archive-keyring/Makefile

@@ -2,12 +2,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=debian-archive-keyring
-PKG_VERSION:=2023.4
-PKG_HASH:=6e93a87b9e50bd81518880ec07a62f95d7d8452f4aa703f5b0a3076439f1022c
-PKG_RELEASE:=1
+PKG_VERSION:=2021.1.1
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_all.deb
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/$(PKG_NAME)/
+PKG_SOURCE:=debian-archive-keyring_2021.1.1_all.deb
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/
+PKG_HASH:=56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>

admin/debootstrap/Makefile

@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=debootstrap
-PKG_VERSION:=1.0.128+nmu2+deb12u1
+PKG_VERSION:=1.0.126
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
 PKG_SOURCE_URL:=@DEBIAN/pool/main/d/debootstrap
-PKG_HASH:=4fa4ec7c144ed047c47d0d8eb9b91b56eaa9b2db2b52510777abbabf5965d268
+PKG_HASH:=ca8233789167fd7ddf50aab8d4cb5085436832efdf54423fa3e446832d625a92
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=Unique

admin/htop/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=htop
-PKG_VERSION:=3.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=3.2.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/htop-dev/htop/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=1e5cc328eee2bd1acff89f860e3179ea24b85df3ac483433f92a29977b14b045
+PKG_HASH:=b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

admin/monit/Makefile

@@ -8,18 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=5.33.0
-PKG_RELEASE:=1
+PKG_VERSION:=5.26.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://bitbucket.org/tildeslash/monit/downloads/
-PKG_HASH:=1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5
+PKG_SOURCE_URL:=https://mmonit.com/monit/dist
+PKG_HASH:=87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2
 
-PKG_MAINTAINER:=Yaroslav Petrov <info@lank.me>
+PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:tildeslash:monit
 
+PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
@@ -77,11 +78,6 @@ ifeq ($(BUILD_VARIANT),nossl)
 		--without-ssl
 endif
 
-define Build/Prepare
-	$(Build/Prepare/Default)
-	(cd $(PKG_BUILD_DIR) && ./bootstrap)
-endef
-
 define Package/monit/conffiles
 /etc/monitrc
 endef

admin/monit/patches/001-fix-default-piddir.patch

@@ -1,6 +1,24 @@
+--- a/configure
++++ b/configure
+@@ -14436,14 +14436,7 @@ fi
+ # Find the right directory to put the root-mode PID file in
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pid file location" >&5
+ $as_echo_n "checking pid file location... " >&6; }
+-if test -d "/run"
+-then
+-	piddir="/run"
+-elif test -d "/var/run"; then
+-        piddir="/var/run"
+-elif test -d "/etc"; then
+-        piddir="/etc"
+-fi
++piddir="/var/run"
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
 --- a/configure.ac
 +++ b/configure.ac
-@@ -477,14 +477,7 @@ AC_ARG_WITH(ipv6,
+@@ -501,14 +501,7 @@ fi
  
  # Find the right directory to put the root-mode PID file in
  AC_MSG_CHECKING([pid file location])

admin/netatop/patches/100-fix-compilation-warning-fallthrough.patch

@@ -1,11 +0,0 @@
---- a/module/netatop.c
-+++ b/module/netatop.c
-@@ -1617,7 +1617,7 @@ getsockopt(struct sock *sk, int cmd, void __user *user, int *len)
- 
-  	   case NETATOP_GETCNT_TGID:
- 		tasktype = 'g';		
--		// fall through
-+		fallthrough;
-  	   case NETATOP_GETCNT_PID:
- 		if (*len < sizeof(pid_t))
- 			return -EINVAL;

admin/netdata/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netdata
 PKG_VERSION:=1.33.1
-PKG_RELEASE:=4
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -24,7 +24,7 @@ PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
-PKG_BUILD_FLAGS:=no-mips16 gc-sections
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +44,9 @@ define Package/netdata/description
   python3-urllib3
 endef
 
-TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
+TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -O3
+TARGET_LDFLAGS += -Wl,--gc-sections
 
 CONFIGURE_ARGS += \
 	--with-zlib \

admin/nload/Makefile

@@ -1,40 +0,0 @@
-# SPDX-Identifier-License: GPL-2.0-only
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nload
-PKG_VERSION:=0.7.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/rolandriegel/nload/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=a73b3a75356776860fc4c40daebce04c5022f73d39704a12fb0aeb88a751216a
-
-PKG_MAINTAINER:=Jacky Guo <leickwell@hotmail.com>
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nload
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=A network traffic monitor
-  DEPENDS:=+libncurses +libstdcpp
-  URL:=https://github.com/rolandriegel/nload
-endef
-
-define Package/nload/description
-  Monitors network traffic and bandwidth usage.
-endef
-
-define Package/nload/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nload $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,nload))

admin/nload/test.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nload -h | grep "$PKG_VERSION"

admin/nyx/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nyx
 PKG_VERSION:=2.1.0
-PKG_RELEASE:=3
+PKG_RELEASE:=2
 
 PYPI_NAME:=nyx
 PKG_HASH:=88521488d1c9052e457b9e66498a4acfaaa3adf3adc5a199892632f129a5390b

admin/nyx/patches/01-python311.patch

@@ -1,32 +0,0 @@
-From dcaddf2ab7f9d2ef8649f98bb6870995ebe0b893 Mon Sep 17 00:00:00 2001
-From: Juan Orti Alcaine <jortialc@redhat.com>
-Date: Mon, 27 Jun 2022 19:38:34 +0200
-Subject: [PATCH] Replace inspect.getargspec usage to support python 3.11
-
----
- nyx/panel/__init__.py | 2 +-
- test/__init__.py      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/nyx/panel/__init__.py
-+++ b/nyx/panel/__init__.py
-@@ -78,7 +78,7 @@ class KeyHandler(collections.namedtuple(
-       is_match = self._key_func(key) if self._key_func else key.match(self.key)
- 
-       if is_match:
--        if inspect.getargspec(self._action).args == ['key']:
-+        if inspect.getfullargspec(self._action).args == ['key']:
-           self._action(key)
-         else:
-           self._action()
---- a/test/__init__.py
-+++ b/test/__init__.py
-@@ -94,7 +94,7 @@ def render(func, *args, **kwargs):
-     nyx.curses.CURSES_SCREEN.erase()
-     start_time = time.time()
- 
--    func_args = inspect.getargspec(func).args
-+    func_args = inspect.getfullargspec(func).args
- 
-     if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']:
-       def _draw(subwindow):

admin/openwisp-config/Makefile

@@ -1,14 +1,14 @@
-# SPDX-Identifier-License: GPL-3.0-only
-#
 # openwisp.org
-
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openwisp-config
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Federico Capoano <f.capoano@openwisp.io>
-PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE:=GPL3.0-or-later
 
 PKG_SOURCE_URL:=https://github.com/openwisp/openwisp-config.git
 PKG_MIRROR_HASH:=7daa10a9d170e665f33a5555a246b4da2223c2d8d0e8a047edb01701c8886986

admin/openwisp-monitoring/Makefile

@@ -1,14 +1,14 @@
-# SPDX-Identifier-License: GPL-3.0-only
-#
 # openwisp.org
-
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openwisp-monitoring
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Federico Capoano <support@openwisp.io>
-PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE:=GPL3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_URL:=https://github.com/openwisp/openwrt-openwisp-monitoring.git

admin/rsyslog/Makefile

@@ -72,8 +72,6 @@ define Package/rsyslog/install
 	$(INSTALL_CONF) ./files/rsyslog.conf $(1)/etc
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/rsyslog.init $(1)/etc/init.d/rsyslog
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_CONF) ./files/20_rsyslog $(1)/etc/uci-defaults
 endef
 
 define Package/rsyslog/config

admin/rsyslog/files/20_rsyslog

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-grep -qv -e '^\s*#' -e '^\s*$' /etc/rsyslog.conf 2>/dev/null && exit 0
-[ "$(uci -q get rsyslog.syslog)" == "syslog" ] && exit 0
-
-uci -q import rsyslog << EOI
-config syslog 'syslog'
-	option tcp_input_port '514'
-	option udp_input '1'
-	option tcp_input '0'
-	option udp_input_port '514'
-	option default_template 'RSYSLOG_TraditionalFileFormat'
-	list modules 'imuxsock'
-	list modules 'imklog'
-
-config selector
-	option source '*.info;mail.none;authpriv.none;cron.none'
-	option destination '/var/log/messages'
-
-config selector
-	option source 'authpriv.*'
-	option destination '/var/log/secure'
-
-config selector
-	option source 'mail.*'
-	option destination '/var/log/maillog'
-
-config selector
-	option source 'cron.*'
-	option destination '/var/log/cron'
-
-config selector
-	option source 'local7.*'
-	option destination '/var/log/boot.log'
-EOI

admin/rsyslog/files/rsyslog.conf

@@ -1,18 +1,18 @@
-#
-# The preferred way to configure rsyslogd is now UCI.
-#
-# This file can be still used and will be included
-# on top of the final configuration inside /var/etc/rsyslog.conf
-#
-# Example of default configuration:
-#
-# module(load="imuxsock")
-# module(load="imklog")
-# module(load="imudp")
-# input(type="imudp" port="514")
-# $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-# *.info;mail.none;authpriv.none;cron.none  /var/log/messages
-# authpriv.*                                /var/log/secure
-# mail.*                                    /var/log/maillog
-# cron.*                                    /var/log/cron
-# local7.*                                  /var/log/boot.log
+module(load="imuxsock")
+module(load="imklog")
+module(load="imudp")
+input(type="imudp" port="514")
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+*.info;mail.none;authpriv.none;cron.none  /var/log/messages
+
+authpriv.*                                /var/log/secure
+
+mail.*                                    /var/log/maillog
+
+cron.*                                    /var/log/cron
+
+local7.*                                  /var/log/boot.log

admin/rsyslog/files/rsyslog.init

@@ -1,114 +1,12 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2014 OpenWrt.org
 
-# shellcheck disable=SC3043
-# shellcheck disable=SC2034
-# shellcheck disable=SC3037
-# shellcheck disable=SC2154
-# shellcheck disable=SC2129
-
 START=20
 
 USE_PROCD=1
 
-UCI_CONF="rsyslog"
-CONFIG_FILE="/var/etc/rsyslog.conf"
-BASE_CONFIG_FILE="/etc/rsyslog.conf"
-
-modules=""
-selectors=""
-forwarders=""
-
-handle_selector() {
-	local config="$1"
-	local src
-	local dst
-
-	config_get src "${config}" source
-	config_get dst "${config}" destination
-	if [ "${src}" != "" ] && [ "$dst" != "" ]; then
-		selectors="${selectors}\n${src}\t${dst}\n"
-	fi
-}
-
-handle_forwarder() {
-	local config="$1"
-	local src
-	local target
-	local protocol
-	local port
-	local rfc
-	local opts
-
-	config_get src "${config}" source
-	config_get target "${config}" target
-	config_get protocol "${config}" protocol "udp"
-	config_get port "${config}" port "514"
-	config_get rfc "${config}" rfc "3164"
-
-	if [ "$rfc" = "5424" ]; then
-		opts='Template="RSYSLOG_SyslogProtocol23Format" TCP_Framing="octet-counted"'
-	fi
-
-	if [ "${src}" != "" ] && [ "${target}" != "" ]; then
-		action="action(type=\"omfwd\" target=\"$target\" port=\"$port\" protocol=\"$protocol\" $opts action.resumeRetryCount=\"100\" queue.type=\"linkedList\" queue.size=\"10000\")"
-	   forwarders="${forwarders}\n${src}\t${action}\n"
-	fi
-}
-
-
-expand_config() {
-	local input_t=""
-	local input_u=""
-
-	config_load "${UCI_CONF}"
-	config_list_foreach syslog modules handle_module
-	config_get_bool tcp_input syslog tcp_input
-	if [ "${tcp_input}" -eq 1 ]; then
-		modules="${modules} imtcp"
-		config_get tcp_port syslog tcp_input_port
-		input_t="input(type=\"imtcp\" port=\"${tcp_port}\")"
-	fi
-
-	config_get_bool udp_input syslog udp_input
-	if [ "${udp_input}" -eq 1 ]; then
-		modules="${modules} imudp"
-		config_get udp_port syslog udp_input_port
-		input_u="input(type=\"imudp\" port=\"${udp_port}\")"
-
-	fi
-	config_get template syslog default_template
-	config_foreach handle_selector selector
-	config_foreach handle_forwarder forwarder
-
-	mkdir -p "$(dirname ${CONFIG_FILE})"
-	# shellcheck disable=SC2188
-	> ${CONFIG_FILE}
-	echo "include(file=\"${BASE_CONFIG_FILE}\" mode=\"optional\")" >> ${CONFIG_FILE}
-	for m in ${modules}; do
-		echo "module(load=\"${m}\")" >> ${CONFIG_FILE}
-	done
-	echo "${input_t}" >> ${CONFIG_FILE}
-	echo "${input_u}" >> ${CONFIG_FILE}
-	echo "\$ActionFileDefaultTemplate ${template}" >> ${CONFIG_FILE}
-	echo -e "${selectors}" >> ${CONFIG_FILE}
-	echo -e "${forwarders}" >> ${CONFIG_FILE}
-}
-
-handle_module() {
-	local module="$1"
-	modules="${modules} $module"
-}
-
 start_service() {
-	expand_config
 	procd_open_instance
-	procd_set_param command /usr/sbin/rsyslogd -f ${CONFIG_FILE} -n
+	procd_set_param command /usr/sbin/rsyslogd -n
 	procd_close_instance
 }
-
-
-service_triggers()
-{
-	procd_add_reload_trigger ${UCI_CONF}
-}

admin/schroot/Makefile

@@ -1,25 +1,23 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=reschroot
-PKG_VERSION:=1.6.13
-PKG_RELEASE:=1
+PKG_NAME:=schroot
+PKG_VERSION:=1.6.10
+PKG_RELEASE:=3
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeberg.org/shelter/reschroot/archive/release
-PKG_HASH:=c05d6a1bb0210d401e6522eee2c465e0b43c6c98f7101d671f9e9ef88b3accf5
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz
+PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/s/schroot
+PKG_HASH:=3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
 
 PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=COPYING
 
-CMAKE_INSTALL:=1
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
 
-CMAKE_BINARY_SUBDIR:=build
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/schroot
   SECTION:=admin
@@ -32,7 +30,7 @@ define Package/schroot
 	+SCHROOT_LVM:lvm2 \
 	+SCHROOT_UUID:libuuid \
 	$(INTL_DEPENDS)
-  URL:=https://codeberg.org/shelter/reschroot
+  URL:=https://salsa.debian.org/debian/schroot
 endef
 
 define Package/schroot/description
@@ -53,21 +51,20 @@ PKG_CONFIG_DEPENDS := \
 	CONFIG_SCHROOT_LVM \
 	CONFIG_SCHROOT_UUID
 
-CMAKE_OPTIONS += \
-	-Dbtrfs-snapshot=$(if $(CONFIG_SCHROOT_BTRFS),ON,OFF) \
-	-Dloopback=$(if $(CONFIG_SCHROOT_LOOPBACK),ON,OFF) \
-	-Dlvm-snapshot=$(if $(CONFIG_SCHROOT_LVM),ON,OFF) \
-	-Duuid=$(if $(CONFIG_SCHROOT_UUID),ON,OFF) \
-	-Dblock-device=ON \
-	-Dunion=ON \
-	-Ddhcroot=OFF \
-	-Ddchroot-dsa=OFF \
-	-Ddebug=OFF \
-	-Ddoxygen=OFF \
-	-Dpam=OFF \
-	-Dtest=OFF \
-	-Duuid=OFF \
-	-Dzfs-snapshot=OFF
+CONFIGURE_ARGS += \
+	$(if $(CONFIG_SCHROOT_BTRFS),--enable,--disable)-btrfs-snapshot \
+	$(if $(CONFIG_SCHROOT_LOOPBACK),--enable,--disable)-loopback \
+	$(if $(CONFIG_SCHROOT_LVM),--enable,--disable)-lvm-snapshot \
+	$(if $(CONFIG_SCHROOT_UUID),--enable,--disable)-uuid \
+	--enable-block-device \
+	--enable-union \
+	--disable-dchroot \
+	--disable-dchroot-dsa \
+	--disable-csbuild \
+	--disable-debug \
+	--disable-pam \
+	--disable-doxygen \
+	--disable-rpath
 
 define Package/schroot/install
 	$(INSTALL_DIR) $(1)/usr/bin
@@ -76,8 +73,7 @@ define Package/schroot/install
 	$(CP) -R $(PKG_INSTALL_DIR)/etc/schroot/* $(1)/etc/schroot
 	$(INSTALL_DIR) $(1)/usr/lib/schroot
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libsbuild.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/libexec/schroot
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/schroot/schroot-* $(1)/usr/libexec/schroot/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/schroot/* $(1)/usr/lib/schroot/
 	$(INSTALL_DIR) $(1)/usr/share/schroot
 	$(CP) -R $(PKG_INSTALL_DIR)/usr/share/schroot/* $(1)/usr/share/schroot/
 	$(INSTALL_DIR) $(1)/etc/init.d

admin/schroot/files/schroot.init

@@ -4,7 +4,7 @@ START=94
 
 start() {
 	[ -d /var/lib/schroot ] || {
-		mkdir -p /var/lib/schroot/session /var/lib/schroot/unpack /var/lib/schroot/union/overlay /var/lib/schroot/union/underlay
+		mkdir -p /var/lib/schroot/mount /var/lib/schroot/session /var/lib/schroot/unpack /var/lib/schroot/union/overlay /var/lib/schroot/union/underlay
 		chmod 0700 /var/lib/schroot
 	}
 }

admin/schroot/patches/01-openwrt.patch

@@ -1,50 +1,96 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -210,8 +210,8 @@ endif(BUILD_PAM)
- set(BLOCKDEV_DEFAULT ON)
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then
+   HAVE_DOXYGEN="no"
+ fi
+ HAVE_LVM="yes"
+-AC_PATH_PROG([LVCREATE], [lvcreate], [], [$PATH:/sbin:/usr/sbin])
+-AC_PATH_PROG([LVREMOVE], [lvremove], [], [$PATH:/sbin:/usr/sbin])
+-if test -z "$LVCREATE" || test -z "$LVREMOVE"; then
+-  HAVE_LVM="no"
+-fi
+ HAVE_BTRFS="yes"
+-AC_PATH_PROG([BTRFS], [btrfs], [], [$PATH:/sbin:/usr/sbin])
+-AC_PATH_PROG([BTRFSCTL], [btrfsctl], [], [$PATH:/sbin:/usr/sbin])
+-if test -z "$BTRFS" || test -z "$BTRFSCTL"; then
+-  HAVE_BTRFS="no"
+-fi
+ HAVE_LOOPBACK="yes"
+-AC_PATH_PROG([LOSETUP], [losetup], [], [$PATH:/sbin:/usr/sbin])
+-if test -z "$LOSETUP"; then
+-  HAVE_LOOPBACK="no"
+-fi
  
- # LVM snapshot mount feature
--find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
--find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
-+#find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
-+#find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
- set(LVMSNAP_DEFAULT OFF)
- if (LVCREATE_EXECUTABLE AND LVREMOVE_EXECUTABLE)
-   set (LVMSNAP_DEFAULT ON)
-@@ -224,7 +224,7 @@ if (lvm-snapshot)
- endif(lvm-snapshot)
  
- # ZFS snapshot mount feature
--find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
-+#find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
- set(ZFSSNAP_DEFAULT OFF)
- if (ZFS_EXECUTABLE)
-   set (ZFSSNAP_DEFAULT ON)
-@@ -237,7 +237,7 @@ if (zfs-snapshot)
- endif(zfs-snapshot)
+ # Check for host platform
+@@ -336,7 +322,6 @@ PKG_CHECK_MODULES([UUID], [uuid],
+                   [HAVE_UUID=yes],
+                   [HAVE_UUID=no])
  
- # Btrfs snapshot mount feature
--find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
-+#find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
- set(BTRFSSNAP_DEFAULT OFF)
- if (BTRFS_EXECUTABLE)
-   set (BTRFSSNAP_DEFAULT ON)
-@@ -310,15 +310,9 @@ include_directories(${PROJECT_BINARY_DIR
-                     ${PROJECT_BINARY_DIR}
-                     ${PROJECT_SOURCE_DIR})
+-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
+ AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
  
--enable_testing()
--
- add_subdirectory(sbuild)
- add_subdirectory(bin)
--add_subdirectory(test)
--add_subdirectory(doc)
- add_subdirectory(etc)
--add_subdirectory(po)
--add_subdirectory(man)
+ SCHROOT_CFLAGS="$UUID_CFLAGS"
+@@ -688,42 +673,25 @@ if test "$BOOST_PROGRAM_OPTIONS_VALIDATI
+ fi
  
- add_custom_target(check-news
-   COMMAND if grep -q "Welcome to ${CMAKE_PROJECT_NAME} ${GIT_RELEASE_VERSION}" "${PROJECT_SOURCE_DIR}/NEWS" \; then echo "NEWS current version ${GIT_RELEASE_VERSION}" \; else echo "NEWS current version does not match release version ${GIT_RELEASE_VERSION}" \; exit 1 \; fi
+ dnl Note the use of quadrigraphs to quote [ and ] in regexes.
+-AH_TEMPLATE(HAVE_REGEX_REGEX, [Set if the <regex> header file includes std::regex])
+ AH_TEMPLATE(HAVE_BOOST_REGEX, [Set if the <boost/regex.hpp> header file includes boost::regex])
+-AC_MSG_CHECKING([for std::regex])
+-define([testprog], [AC_LANG_PROGRAM([#include <regex>],
+-                                   [std::regex foo("^foo@<:@bar@:>@$");
+-                                    std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);
+-                                    std::regex check("^@<:@^:/,.@:>@@<:@^:/,@:>@*$", std::regex::extended);])])
+-AC_RUN_IFELSE(testprog,
+-  [AC_MSG_RESULT([yes])
+-   AC_DEFINE(HAVE_REGEX_REGEX, 1)],
+-  [dnl Check if std::regex is present but broken.
+-define([testprog], [AC_LANG_PROGRAM([#include <regex>],
+-                                   [std::regex foo("^foo@<:@bar@:>@$");
+-                                    std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);])])
++AC_MSG_CHECKING([for boost::regex in -lboost_regex])
++saved_LIBS="${LIBS}"
++LIBS="${saved_LIBS} -lboost_regex"
++define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
++                                [boost::regex("^foo@<:@bar@:>@$");
++                                 boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
+ AC_LINK_IFELSE(testprog,
+-  [AC_MSG_RESULT([broken])],
+-  [AC_MSG_RESULT([no])])
+-   AC_MSG_CHECKING([for boost::regex in -lboost_regex])
+-   saved_LIBS="${LIBS}"
+-   LIBS="${saved_LIBS} -lboost_regex"
+-   define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+-                                   [boost::regex("^foo@<:@bar@:>@$");
+-                                    boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
+-   AC_LINK_IFELSE(testprog,
+-                  [AC_MSG_RESULT([yes])
+-                   AC_DEFINE(HAVE_BOOST_REGEX, 1)
+-                   BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
+-                  [LIBS="${saved_LIBS} -lboost_regex-mt"
+-                   AC_LINK_IFELSE(testprog,
+-                          [AC_MSG_RESULT([yes])
+-                           AC_DEFINE(HAVE_BOOST_REGEX, 1)
+-                           BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
+-                          [AC_MSG_RESULT([no])
+-                    AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
+-   LIBS="${saved_LIBS}"
+-])
++               [AC_MSG_RESULT([yes])
++                AC_DEFINE(HAVE_BOOST_REGEX, 1)
++                BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
++               [LIBS="${saved_LIBS} -lboost_regex-mt"
++                AC_LINK_IFELSE(testprog,
++                       [AC_MSG_RESULT([yes])
++                        AC_DEFINE(HAVE_BOOST_REGEX, 1)
++                        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
++                       [AC_MSG_RESULT([no])
++                 AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
++LIBS="${saved_LIBS}"
+ 
+ AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
+ saved_LIBS="${LIBS}"
 --- a/bin/schroot-base/schroot-base-run.h
 +++ b/bin/schroot-base/schroot-base-run.h
 @@ -61,8 +61,8 @@ namespace schroot_base

admin/sudo/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sudo
-PKG_VERSION:=1.9.15p5
-PKG_RELEASE:=1
+PKG_VERSION:=1.9.10
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.sudo.ws/dist
-PKG_HASH:=558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558
+PKG_HASH:=44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 
@@ -23,7 +23,6 @@ PKG_CPE_ID:=cpe:/a:todd_miller:sudo
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
 
 include $(INCLUDE_DIR)/package.mk
 

admin/sudo/patches/020-no-owner-change.patch

@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -75,7 +75,7 @@ EGREP = @EGREP@
+@@ -73,7 +73,7 @@ SHELL = @SHELL@
  SED = @SED@
  
  INSTALL = $(SHELL) $(scriptdir)/install-sh -c

admin/sudo/test.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	sudo)
-		sudo --version | grep "$2"
-		;;
-esac

admin/syslog-ng/Makefile

@@ -1,17 +1,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=4.4.0
-PKG_RELEASE:=1
+PKG_VERSION:=3.38.1
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
+PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING LGPL.txt GPL.txt
 PKG_CPE_ID:=cpe:/a:balabit:syslog-ng
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_HASH:=583b147f3ec17fbc2dbbf31aafb1e3966237d7541313de5b41ea885dc16d932e
+PKG_HASH:=5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -33,7 +33,7 @@ define Package/syslog-ng
   CATEGORY:=Administration
   TITLE:=A powerful syslog daemon
   URL:=https://www.syslog-ng.com/products/open-source-log-management/
-  DEPENDS:=+libpcre2 +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid +SYSLOGNG_LOGROTATE:logrotate
+  DEPENDS:=+libpcre +glib2 +libopenssl +libpthread +librt +zlib +libdbi +libjson-c +libcurl +libuuid +SYSLOGNG_LOGROTATE:logrotate
 endef
 
 define Package/syslog-ng/description
@@ -89,7 +89,6 @@ CONFIGURE_ARGS +=  \
 	--disable-sql \
 	--disable-linux-caps \
 	--with-jsonc=system \
-	--enable-cpp=no \
 	--enable-json=yes \
 	--enable-http=yes \
 	--disable-smtp \

admin/syslog-ng/files/syslog-ng.conf

@@ -4,7 +4,7 @@
 # More details about these settings can be found here:
 # https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition
 
-@version: 4.4
+@version: 4.0
 @include "scl.conf"
 
 options {

admin/zabbix/Makefile

@@ -8,13 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zabbix
-PKG_VERSION:=6.4.7
+PKG_VERSION:=5.0.18
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/$(basename $(PKG_VERSION))/ \
-	https://cdn.zabbix.com/zabbix/sources/oldstable/$(basename $(PKG_VERSION))/
-PKG_HASH:=6b4e81f07de4c82c7994871bea51be4d6427683fa9a7fbe112fd7559b3670e49
+PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/
+PKG_HASH:=7d15c4d683801edc2bdcda3fd94afdf6a7142a1a92aa71f4a9220af8e39d9e0e
 
 PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 PKG_LICENSE:=GPL-2.0
@@ -26,13 +25,12 @@ PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= \
   CONFIG_ZABBIX_MYSQL \
-  CONFIG_ZABBIX_POSTGRESQL \
-  CONFIG_ZABBIX_SQLITE
+  CONFIG_ZABBIX_POSTGRESQL
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
-define Package/zabbix-proxy/config
+define Package/zabbix-server/config
 comment "Database Software"
 
 choice
@@ -45,8 +43,6 @@ choice
         config ZABBIX_POSTGRESQL
                 bool "PostgreSQL"
 
-        config ZABBIX_SQLITE
-                bool "SQLite"
 endchoice
 endef
 
@@ -57,7 +53,7 @@ define Package/zabbix/Default
   TITLE:=Zabbix
   URL:=https://www.zabbix.com/
   USERID:=zabbix=53:zabbix=53
-  DEPENDS+=$(ICONV_DEPENDS) +libpcre2 +zlib
+  DEPENDS+=$(ICONV_DEPENDS) +libpcre +zlib
 endef
 
 define Package/zabbix-agentd
@@ -153,12 +149,7 @@ endef
 define Package/zabbix-server/Default
   $(call Package/zabbix/Default)
   TITLE+= server
-  DEPENDS += +ZABBIX_POSTGRESQL:libpq \
-    +ZABBIX_MYSQL:libmariadbclient \
-    @(!ZABBIX_SQLITE) \
-    +libevent2 \
-    +libevent2-pthreads \
-    +fping
+  DEPENDS += +ZABBIX_POSTGRESQL:libpq +ZABBIX_MYSQL:libmariadbclient +libevent2
 endef
 
 define Package/zabbix-server
@@ -187,31 +178,15 @@ endef
 define Package/zabbix-server-frontend
   $(call Package/zabbix/Default)
   TITLE+= server-frontend
-  DEPENDS += +php8 \
-    +php8-cgi \
-    +php8-mod-gd \
-    +php8-mod-bcmath \
-    +php8-mod-ctype \
-    +php8-mod-xmlreader \
-    +php8-mod-xmlwriter \
-    +php8-mod-session \
-    +php8-mod-sockets \
-    +php8-mod-mbstring \
-    +php8-mod-gettext \
-    +ZABBIX_POSTGRESQL:php8-mod-pgsql \
-    +ZABBIX_MYSQL:php8-mod-mysqli \
-    @(!ZABBIX_SQLITE)
+  DEPENDS += +php8 +php8-cgi +ZABBIX_POSTGRESQL:php8-mod-pgsql +ZABBIX_MYSQL:php8-mod-mysqli \
+  +php8-mod-gd +php8-mod-bcmath +php8-mod-ctype +php8-mod-xmlreader +php8-mod-xmlwriter \
+  +php8-mod-session +php8-mod-sockets +php8-mod-mbstring +php8-mod-gettext
 endef
 
 define Package/zabbix-proxy/Default
   $(call Package/zabbix/Default)
   TITLE+= proxy
-  DEPENDS += +ZABBIX_POSTGRESQL:libpq \
-    +ZABBIX_MYSQL:libmariadbclient \
-    +ZABBIX_SQLITE:libsqlite3 \
-    +libevent2 \
-    +libevent2-pthreads \
-    +fping
+  DEPENDS += +ZABBIX_POSTGRESQL:libpq +ZABBIX_MYSQL:libmariadbclient +libevent2
 endef
 
 define Package/zabbix-proxy
@@ -257,15 +232,14 @@ endef
 
 CONFIGURE_ARGS+= \
 	--enable-agent \
-	$(if $(CONFIG_ZABBIX_SQLITE),--disable-server,--enable-server) \
+	--enable-server \
 	--enable-proxy \
 	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
 	--disable-java \
 	$(if $(CONFIG_ZABBIX_MYSQL),--with-mysql) \
 	$(if $(CONFIG_ZABBIX_POSTGRESQL),--with-postgresql) \
-	$(if $(CONFIG_ZABBIX_SQLITE),--with-sqlite3=$(STAGING_DIR)/usr) \
-	--with-libevent=$(STAGING_DIR)/usr/include \
-	--with-libpcre2=$(STAGING_DIR)/usr/include \
+	--with-libevent=$(STAGING_DIR)/usr/include/libevent \
+	--with-libpcre=$(STAGING_DIR)/usr/include \
 	--with-zlib=$(STAGING_DIR)/usr/include
 
 ifeq ($(BUILD_VARIANT),openssl)

admin/zabbix/patches/010-change-agentd-config.patch

@@ -35,16 +35,16 @@
  
  ##### Active checks related
  
-@@ -164,8 +162,6 @@ Server=127.0.0.1
+@@ -151,8 +149,6 @@ Server=127.0.0.1
  # Default:
  # ServerActive=
  
 -ServerActive=127.0.0.1
 -
  ### Option: Hostname
- #	List of comma delimited unique, case sensitive hostnames.
- #	Required for active checks and must match hostnames as configured on the server.
-@@ -175,8 +171,6 @@ ServerActive=127.0.0.1
+ #	Unique, case sensitive hostname.
+ #	Required for active checks and must match hostname as configured on the server.
+@@ -162,8 +158,6 @@ ServerActive=127.0.0.1
  # Default:
  # Hostname=
  
@@ -53,7 +53,7 @@
  ### Option: HostnameItem
  #	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
  #	Does not support UserParameters or aliases.
-@@ -326,8 +320,8 @@ Hostname=Zabbix server
+@@ -303,8 +297,8 @@ Hostname=Zabbix server
  # Include=
  
  # Include=/usr/local/etc/zabbix_agentd.userparams.conf

admin/zabbix/patches/110-reproducible-builds.patch

@@ -1,11 +1,11 @@
---- a/src/libs/zbxcommon/misc.c
-+++ b/src/libs/zbxcommon/misc.c
-@@ -329,7 +329,7 @@ void	zbx_help(void)
- void	zbx_version(void)
+--- a/src/libs/zbxcommon/str.c
++++ b/src/libs/zbxcommon/str.c
+@@ -54,7 +54,7 @@ static const char	help_message_footer[]
+ void	version(void)
  {
  	printf("%s (Zabbix) %s\n", title_message, ZABBIX_VERSION);
 -	printf("Revision %s %s, compilation time: %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE, __DATE__, __TIME__);
 +	printf("Revision %s %s\n\n", ZABBIX_REVISION, ZABBIX_REVDATE);
  	puts(copyright_message);
- }
- 
+ #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
+ 	printf("\n");

devel/bison/Makefile

@@ -1,43 +0,0 @@
-# SPDX-Identifier-License: GPL-2.0-only
-#
-# Copyright (C) 2022 W. Michael Petullo <mike@flyn.org>
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bison
-PKG_VERSION:=3.8.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-PKG_LICENSE:=GPL-3.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bison
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=bison
-  URL:=http://www.gnu.org/software/bison/
-endef
-
-define Package/bison/description
-  Bison is a general-purpose parser generator
-endef
-
-CONFIGURE_ARGS += --enable-threads=posix --disable-nls
-
-define Package/bison/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/bison \
-		$(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bison))

devel/delve/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=delve
-PKG_VERSION:=1.20.1
+PKG_VERSION:=1.8.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/go-delve/delve/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=a10aa97d3f6b6219877a73dd305d511442ad0caab740de76fc005796a480de93
+PKG_HASH:=fbf6ea7e1ed0c92e543c7f5f2343928e185e11e4cba1c7c9d3bfc28d1c323900
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -14,7 +14,7 @@ PKG_MAINTAINER:=Niels Widger <niels@qacafe.com>
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
+PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/go-delve/delve/
 GO_PKG_BUILD_PKG:=github.com/go-delve/delve/cmd/dlv/

devel/diffutils/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=diffutils
 PKG_VERSION:=3.8
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/diffutils

devel/flex/Makefile

@@ -1,52 +0,0 @@
-# SPDX-Identifier-License: GPL-2.0-only
-#
-# Copyright (C) 2022 W. Michael Petullo <mike@flyn.org>
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=flex
-PKG_VERSION:=2.6.4
-PKG_RELEASE:=4
-PKG_CPE_ID:=cpe:/a:flex_project:flex
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/westes/flex/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995
-
-PKG_FIXUP:=autoreconf gettext-version
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/flex
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=flex
-  URL:=https://github.com/westes/flex
-endef
-
-define Package/flex/description
-  flex is a tool for generating scanners: programs which recognize lexical patterns in text
-endef
-
-CONFIGURE_ARGS += --disable-shared --disable-bootstrap
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/flex/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/flex \
-		$(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,flex))

devel/flex/patches/100-disable-all-dirs-except-src.patch

@@ -1,16 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -42,12 +42,7 @@ EXTRA_DIST = \
- 	autogen.sh
- 
- SUBDIRS = \
--	src \
--	doc \
--	examples \
--	po \
--	tests \
--	tools
-+	src
- 
- # Create the ChangeLog, but only if we're inside a git working directory
- 

devel/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch

@@ -1,27 +0,0 @@
-From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001
-From: Explorer09 <explorer09@gmail.com>
-Date: Mon, 4 Sep 2017 10:47:33 +0800
-Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac.
-
-This would, e.g. define _GNU_SOURCE in config.h, enabling the
-reallocarray() prototype in glibc 2.26+ on Linux systems with that
-version of glibc.
-
-Fixes #241.
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,8 +25,10 @@
- # autoconf requirements and initialization
- 
- AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
-+AC_PREREQ([2.60])
- AC_CONFIG_SRCDIR([src/scan.l])
- AC_CONFIG_AUX_DIR([build-aux])
-+AC_USE_SYSTEM_EXTENSIONS
- LT_INIT
- AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects])
- AC_CONFIG_HEADER([src/config.h])

devel/gcc/Makefile

@@ -23,7 +23,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gcc
 GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION))
 PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION)))
-PKG_RELEASE:=5
+PKG_RELEASE:=$(AUTORELEASE)
 GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
@@ -42,12 +42,8 @@ ifeq ($(PKG_VERSION),10.3.0)
 	PKG_HASH:=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 endif
 
-ifeq ($(PKG_VERSION),11.3.0)
-	PKG_HASH:=b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39
-endif
-
-ifeq ($(PKG_VERSION),12.3.0)
-	PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b
+ifeq ($(PKG_VERSION),11.2.0)
+	PKG_HASH:=d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
 endif
 
 PATCH_DIR=./patches/$(GCC_VERSION)
@@ -234,18 +230,14 @@ define Package/gcc/install
 	chmod +x $(1)/usr/bin/gcc_env.sh
 endef
 
-ifeq ($(CONFIG_INCLUDE_STATIC_LINK_SPEC),y)
 define Package/gcc/postinst
-#!/bin/sh
-
-$(INSTALL_STATIC_SPEC)
+	#!/bin/sh
+	$(INSTALL_STATIC_SPEC)
 endef
 
 define Package/gcc/postrm
-#!/bin/sh
-
-$(REMOVE_STATIC_SPEC)
+	#!/bin/sh
+	$(REMOVE_STATIC_SPEC)
 endef
-endif
 
 $(eval $(call BuildPackage,gcc))

devel/gcc/patches/11.2.0/001-v11.3.0-ranger-Fix-up-fold_using_range-range_of_address-PR10.patch

@@ -0,0 +1,114 @@
+From a6219e8e0719b14f474b0dcaa7bde2f4e57474f9 Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Wed, 17 Nov 2021 13:45:53 +0100
+Subject: [PATCH] ranger: Fix up fold_using_range::range_of_address [PR103255]
+
+If on &base->member the offset isn't constant or isn't zero and
+-fdelete-null-pointer-checks and not -fwrapv-pointer and base has a range
+that doesn't include NULL, we return the range of the base.
+Usually it isn't a big deal, because for most pointers we just use
+varying, range_zero and range_nonzero ranges and nothing beyond that,
+but if a pointer is initialized from a constant, we actually track the
+exact range and in that case this causes miscompilation.
+As discussed on IRC, I think doing something like:
+              offset_int off2;
+              if (off_cst && off.is_constant (&off2))
+                {
+                  tree cst = wide_int_to_tree (sizetype, off2 / BITS_PER_UNIT);
+                  // adjust range r with POINTER_PLUS_EXPR cst
+                  if (!range_includes_zero_p (&r))
+                    return true;
+                }
+              // Fallback
+              r = range_nonzero (TREE_TYPE (gimple_assign_rhs1 (stmt)));
+              return true;
+could work, given that most of the pointer ranges are just the simple ones
+perhaps it is too much for little benefit.
+
+2021-11-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/103255
+	* gimple-range.cc (fold_using_range::range_of_address): Return
+	range_nonzero rather than unadjusted base's range.  Formatting fixes.
+
+	* gcc.c-torture/execute/pr103255.c: New test.
+
+(cherry picked from commit c39cb6bf835ca12e590eaa6f90222e51be207c50)
+---
+ gcc/gimple-range.cc                           | 16 +++++---
+ .../gcc.c-torture/execute/pr103255.c          | 41 +++++++++++++++++++
+ 2 files changed, 52 insertions(+), 5 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr103255.c
+
+--- a/gcc/gimple-range.cc
++++ b/gcc/gimple-range.cc
+@@ -491,14 +491,20 @@ gimple_ranger::range_of_address (irange
+ 	}
+       /* If &X->a is equal to X, the range of X is the result.  */
+       if (off_cst && known_eq (off, 0))
+-	  return true;
++	return true;
+       else if (flag_delete_null_pointer_checks
+ 	       && !TYPE_OVERFLOW_WRAPS (TREE_TYPE (expr)))
+ 	{
+-	 /* For -fdelete-null-pointer-checks -fno-wrapv-pointer we don't
+-	 allow going from non-NULL pointer to NULL.  */
+-	   if(!range_includes_zero_p (&r))
+-	    return true;
++	  /* For -fdelete-null-pointer-checks -fno-wrapv-pointer we don't
++	     allow going from non-NULL pointer to NULL.  */
++	  if (!range_includes_zero_p (&r))
++	    {
++	      /* We could here instead adjust r by off >> LOG2_BITS_PER_UNIT
++		 using POINTER_PLUS_EXPR if off_cst and just fall back to
++		 this.  */
++	      r = range_nonzero (TREE_TYPE (gimple_assign_rhs1 (stmt)));
++	      return true;
++	    }
+ 	}
+       /* If MEM_REF has a "positive" offset, consider it non-NULL
+ 	 always, for -fdelete-null-pointer-checks also "negative"
+--- /dev/null
++++ b/gcc/testsuite/gcc.c-torture/execute/pr103255.c
+@@ -0,0 +1,41 @@
++/* PR tree-optimization/103255 */
++
++struct H
++{
++  unsigned a;
++  unsigned b;
++  unsigned c;
++};
++
++#if __SIZEOF_POINTER__ >= 4
++#define ADDR 0x400000
++#else
++#define ADDR 0x4000
++#endif
++#define OFF 0x20
++
++int
++main ()
++{
++  struct H *h = 0;
++  unsigned long o;
++  volatile int t = 1;
++
++  for (o = OFF; o <= OFF; o += 0x1000)
++    {
++      struct H *u;
++      u = (struct H *) (ADDR + o);
++      if (t)
++	{
++	  h = u;
++	  break;
++	}
++    }
++
++  if (h == 0)
++    return 0;
++  unsigned *tt = &h->b;
++  if ((__SIZE_TYPE__) tt != (ADDR + OFF + __builtin_offsetof (struct H, b)))
++    __builtin_abort ();
++  return 0;
++}

devel/gcc/patches/11.2.0/010-documentation.patch

@@ -12,7 +12,7 @@ Date:   Tue Feb 26 16:16:33 2013 +0000
 
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
-@@ -3348,18 +3348,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
+@@ -3355,18 +3355,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
  doc/gccint.info: $(TEXI_GCCINT_FILES)
  doc/cppinternals.info: $(TEXI_CPPINT_FILES)
  

devel/gcc/patches/11.2.0/011-v12-configure-define-TARGET_LIBC_GNUSTACK-on-musl.patch

@@ -22,7 +22,7 @@ Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
 
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -31533,6 +31533,9 @@ fi
+@@ -30954,6 +30954,9 @@ fi
  # Check if the target LIBC handles PT_GNU_STACK.
  gcc_cv_libc_gnustack=unknown
  case "$target" in
@@ -34,7 +34,7 @@ Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
  if test $glibc_version_major -gt 2 \
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7023,6 +7023,9 @@ fi
+@@ -6788,6 +6788,9 @@ fi
  # Check if the target LIBC handles PT_GNU_STACK.
  gcc_cv_libc_gnustack=unknown
  case "$target" in

devel/gcc/patches/11.2.0/910-mbsd_multi.patch

@@ -40,7 +40,7 @@ Date:   Tue Jul 31 00:52:27 2007 +0000
      case OPT_fconstant_string_class_:
        constant_string_class_name = arg;
        break;
-@@ -1198,6 +1207,47 @@ c_common_init (void)
+@@ -1196,6 +1205,47 @@ c_common_init (void)
        return false;
      }
  
@@ -114,7 +114,7 @@ Date:   Tue Jul 31 00:52:27 2007 +0000
  ; On SVR4 targets, it also controls whether or not to emit a
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9058,6 +9058,17 @@ This option is only supported for C and
+@@ -9055,6 +9055,17 @@ This option is only supported for C and
  @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
  @option{-Wno-pointer-sign}.
  

devel/gcc/patches/11.2.0/920-specs_nonfatal_getenv.patch

@@ -7,7 +7,7 @@ Date:   Sat Apr 21 03:02:39 2012 +0000
 
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -10106,8 +10106,10 @@ getenv_spec_function (int argc, const ch
+@@ -10100,8 +10100,10 @@ getenv_spec_function (int argc, const ch
      }
  
    if (!value)

devel/gcc/patches/11.2.0/980-add-nostdinc++.patch

@@ -0,0 +1,73 @@
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Fri, 7 Jan 2022 15:21:03 +0000 (+0000)
+Subject: libstdc++: Add -nostdinc++ for c++17 sources [PR100017]
+X-Git-Tag: releases/gcc-11.3.0~445
+X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=01a70ccd723eb9a479186fe37c972b0d0f8676cf
+
+libstdc++: Add -nostdinc++ for c++17 sources [PR100017]
+
+When building a build!=host compiler, the just-built gcc can't be used
+to build the target libstdc++ (because it is built for the host triplet,
+not the build triplet). The top-level configure.ac sets up the build
+flags for libstdc++ (and other "raw_cxx" libs) like this:
+
+GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
+		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
+		c++)
+
+The -nostdinc++ flag is only used for the IN-TREE-TOOL, i.e. when using
+the just-built gcc/xgcc compiler. This means that the cross-compiler
+used to build libstdc++ will add its own libstdc++ headers to the
+include path. That results in the #include <cfenv> in
+src/c++17/floating_to_chars.cc and src/c++17/floating_from_chars.cc
+doing #include_next <fenv.h> and finding the libstdc++ fenv.h wrapper
+from the host compiler. Because that has the same include guard as the
+<fenv.h> in the libstdc++ we're trying to build, we never reach the
+underlying <fenv.h> from libc. That results in several errors of the
+form:
+
+error: 'fenv_t' has not been declared in '::'
+
+The most correct fix would be to add -nostdinc++ to the
+RAW_CXX_FOR_TARGET variable in configure.ac, or the
+RAW_CXX_TARGET_EXPORTS variable in Makefile.tpl.
+
+Another solution would be to make the libstdc++ <fenv.h> wrapper use
+_GLIBCXX_INCLUDE_NEXT_C_HEADERS like our <stdlib.h> and other C header
+wrappers.
+
+For now though, the simplest and safest solution is to just add
+-nostdinc++ to the CXXFLAGS used for src/c++17/*.cc, which is what this
+does.
+
+libstdc++-v3/ChangeLog:
+
+	PR libstdc++/100017
+	* src/c++17/Makefile.am (AM_CXXFLAGS): Add -nostdinc++.
+	* src/c++17/Makefile.in: Regenerate.
+
+(cherry picked from commit 4fde88e5dd152fe866a97b12e0f8229970d15cb3)
+---
+
+--- a/libstdc++-v3/src/c++17/Makefile.am
++++ b/libstdc++-v3/src/c++17/Makefile.am
+@@ -79,7 +79,7 @@ endif
+ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
+ # as the occasion calls for it.
+ AM_CXXFLAGS = \
+-	-std=gnu++17 \
++	-std=gnu++17 -nostdinc++ \
+ 	$(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
+ 	$(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
+ 	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \
+--- a/libstdc++-v3/src/c++17/Makefile.in
++++ b/libstdc++-v3/src/c++17/Makefile.in
+@@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sourc
+ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
+ # as the occasion calls for it.
+ AM_CXXFLAGS = \
+-	-std=gnu++17 \
++	-std=gnu++17 -nostdinc++ \
+ 	$(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
+ 	$(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
+ 	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \

devel/gcc/patches/12.3.0/002-case_insensitive.patch

@@ -1,24 +0,0 @@
-commit 81cc26c706b2bc8c8c1eb1a322e5c5157900836e
-Author: Felix Fietkau <nbd@openwrt.org>
-Date:   Sun Oct 19 21:45:51 2014 +0000
-
-    gcc: do not assume that the Mac OS X filesystem is case insensitive
-    
-    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-    
-    SVN-Revision: 42973
-
---- a/include/filenames.h
-+++ b/include/filenames.h
-@@ -44,11 +44,6 @@ extern "C" {
- #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
- #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
- #else /* not DOSish */
--#  if defined(__APPLE__)
--#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
--#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
--#    endif
--#  endif /* __APPLE__ */
- #  define HAS_DRIVE_SPEC(f) (0)
- #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
- #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)

devel/gcc/patches/12.3.0/003-dont-choke-when-building-32bit-on-64bit.patch

@@ -1,13 +0,0 @@
---- a/gcc/real.h
-+++ b/gcc/real.h
-@@ -77,8 +77,10 @@ struct GTY(()) real_value {
-    + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */
- 
- /* Verify the guess.  */
-+#ifndef __LP64__
- extern char test_real_width
-   [sizeof (REAL_VALUE_TYPE) <= REAL_WIDTH * sizeof (HOST_WIDE_INT) ? 1 : -1];
-+#endif
- 
- /* Calculate the format for CONST_DOUBLE.  We need as many slots as
-    are necessary to overlay a REAL_VALUE_TYPE on them.  This could be

devel/gcc/patches/12.3.0/010-documentation.patch

@@ -1,35 +0,0 @@
-commit 098bd91f5eae625c7d2ee621e10930fc4434e5e2
-Author: Luka Perkov <luka@openwrt.org>
-Date:   Tue Feb 26 16:16:33 2013 +0000
-
-    gcc: don't build documentation
-    
-    This closes #13039.
-    
-    Signed-off-by: Luka Perkov <luka@openwrt.org>
-    
-    SVN-Revision: 35807
-
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -3366,18 +3366,10 @@ doc/gcc.info: $(TEXI_GCC_FILES)
- doc/gccint.info: $(TEXI_GCCINT_FILES)
- doc/cppinternals.info: $(TEXI_CPPINT_FILES)
- 
--doc/%.info: %.texi
--	if [ x$(BUILD_INFO) = xinfo ]; then \
--		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
--			-I $(gcc_docdir)/include -o $@ $<; \
--	fi
-+doc/%.info:
- 
- # Duplicate entry to handle renaming of gccinstall.info
--doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
--	if [ x$(BUILD_INFO) = xinfo ]; then \
--		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
--			-I $(gcc_docdir)/include -o $@ $<; \
--	fi
-+doc/gccinstall.info:
- 
- doc/cpp.dvi: $(TEXI_CPP_FILES)
- doc/gcc.dvi: $(TEXI_GCC_FILES)

devel/gcc/patches/12.3.0/110-Fix-MIPS-PR-84790.patch

@@ -1,20 +0,0 @@
-Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84790.
-MIPS16 functions have a static assembler prologue which clobbers
-registers v0 and v1. Add these register clobbers to function call
-instructions.
-
---- a/gcc/config/mips/mips.cc
-+++ b/gcc/config/mips/mips.cc
-@@ -3134,6 +3134,12 @@ mips_emit_call_insn (rtx pattern, rtx or
-       emit_insn (gen_update_got_version ());
-     }
- 
-+  if (TARGET_MIPS16 && TARGET_USE_GOT)
-+    {
-+      clobber_reg (&CALL_INSN_FUNCTION_USAGE (insn), MIPS16_PIC_TEMP);
-+      clobber_reg (&CALL_INSN_FUNCTION_USAGE (insn), MIPS_PROLOGUE_TEMP (word_mode));
-+    }
-+
-   if (TARGET_MIPS16
-       && TARGET_EXPLICIT_RELOCS
-       && TARGET_CALL_CLOBBERED_GP)

devel/gcc/patches/12.3.0/230-musl_libssp.patch

@@ -1,13 +0,0 @@
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -987,7 +987,9 @@ proper position among the other output f
- #endif
- 
- #ifndef LINK_SSP_SPEC
--#ifdef TARGET_LIBC_PROVIDES_SSP
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define LINK_SSP_SPEC "-lssp_nonshared"
-+#elif defined(TARGET_LIBC_PROVIDES_SSP)
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit:}"
- #else

devel/gcc/patches/12.3.0/300-mips_Os_cpu_rtx_cost_model.patch

@@ -1,21 +0,0 @@
-commit ecf7671b769fe96f7b5134be442089f8bdba55d2
-Author: Felix Fietkau <nbd@nbd.name>
-Date:   Thu Aug 4 20:29:45 2016 +0200
-
-gcc: add a patch to generate better code with Os on mips
-
-Also happens to reduce compressed code size a bit
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
---- a/gcc/config/mips/mips.cc
-+++ b/gcc/config/mips/mips.cc
-@@ -20216,7 +20216,7 @@ mips_option_override (void)
-     flag_pcc_struct_return = 0;
- 
-   /* Decide which rtx_costs structure to use.  */
--  if (optimize_size)
-+  if (0 && optimize_size)
-     mips_cost = &mips_rtx_cost_optimize_size;
-   else
-     mips_cost = &mips_rtx_cost_data[mips_tune];

devel/gcc/patches/12.3.0/810-arm-softfloat-libgcc.patch

@@ -1,33 +0,0 @@
-commit 8570c4be394cff7282f332f97da2ff569a927ddb
-Author: Imre Kaloz <kaloz@openwrt.org>
-Date:   Wed Feb 2 20:06:12 2011 +0000
-
-    fixup arm soft-float symbols
-    
-    SVN-Revision: 25325
-
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,10 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -58,8 +58,6 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
--
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} \

devel/gcc/patches/12.3.0/820-libgcc_pic.patch

@@ -1,44 +0,0 @@
-commit c96312958c0621e72c9b32da5bc224ffe2161384
-Author: Felix Fietkau <nbd@openwrt.org>
-Date:   Mon Oct 19 23:26:09 2009 +0000
-
-    gcc: create a proper libgcc_pic.a static library for relinking (4.3.3+ for now, backport will follow)
-    
-    SVN-Revision: 18086
-
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -930,11 +930,12 @@ $(libgcov-driver-objects): %$(objext): $
- 
- # Static libraries.
- libgcc.a: $(libgcc-objects)
-+libgcc_pic.a: $(libgcc-s-objects)
- libgcov.a: $(libgcov-objects)
- libunwind.a: $(libunwind-objects)
- libgcc_eh.a: $(libgcc-eh-objects)
- 
--libgcc.a libgcov.a libunwind.a libgcc_eh.a:
-+libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
- 	-rm -f $@
- 
- 	objects="$(objects)";					\
-@@ -958,7 +959,7 @@ all: libunwind.a
- endif
- 
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1164,6 +1165,10 @@ install-shared:
- 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
- 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
- 
-+	$(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
-+	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
-+	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
-+
- 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))

devel/gcc/patches/12.3.0/840-armv4_pass_fix-v4bx_to_ld.patch

@@ -1,28 +0,0 @@
-commit 7edc8ca5456d9743dd0075eb3cc5b04f4f24c8cc
-Author: Imre Kaloz <kaloz@openwrt.org>
-Date:   Wed Feb 2 19:34:36 2011 +0000
-
-    add armv4 fixup patches
-    
-    SVN-Revision: 25322
-
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -91,10 +91,15 @@
- #define MUSL_DYNAMIC_LINKER \
-   "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
- 
-+/* For armv4 we pass --fix-v4bx to linker to support EABI */
-+#undef TARGET_FIX_V4BX_SPEC
-+#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
-+  "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
--#define LINK_SPEC EABI_LINK_SPEC					\
-+#define LINK_SPEC EABI_LINK_SPEC TARGET_FIX_V4BX_SPEC			\
-   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
- 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
- 

devel/gcc/patches/12.3.0/850-use_shared_libgcc.patch

@@ -1,54 +0,0 @@
-commit dcfc40358b5a3cae7320c17f8d1cebd5ad5540cd
-Author: Felix Fietkau <nbd@openwrt.org>
-Date:   Sun Feb 12 20:25:47 2012 +0000
-
-    gcc 4.6: port over the missing patch 850-use_shared_libgcc.patch to prevent libgcc crap from leaking into every single binary
-    
-    SVN-Revision: 30486
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -132,10 +132,6 @@
-   "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} "	\
-   LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
- 
--/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
--   do not use -lfloat.  */
--#undef LIBGCC_SPEC
--
- /* Clear the instruction cache from `beg' to `end'.  This is
-    implemented in lib1funcs.S, so ensure an error if this definition
-    is used.  */
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -71,6 +71,10 @@ see the files COPYING3 and COPYING.RUNTI
- 	  builtin_version ("CRuntime_Musl");			\
-     } while (0)
- 
-+#ifndef LIBGCC_SPEC
-+#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
-+#endif
-+
- /* Determine which dynamic linker to use depending on whether GLIBC or
-    uClibc or Bionic or musl is the default C library and whether
-    -muclibc or -mglibc or -mbionic or -mmusl has been passed to change
---- a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -136,5 +136,5 @@ function output(lib) {
-   else if (inherit[lib])
-     printf("} %s;\n", inherit[lib]);
-   else
--    printf ("\n  local:\n\t*;\n};\n");
-+    printf ("\n\t*;\n};\n");
- }
---- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -67,6 +67,9 @@
- #undef	CPP_OS_DEFAULT_SPEC
- #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)"
- 
-+#undef LIBGCC_SPEC
-+#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
-+
- #undef  LINK_SHLIB_SPEC
- #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}} \
-   %{static-pie:-static -pie --no-dynamic-linker -z text}"

devel/gcc/patches/12.3.0/851-libgcc_no_compat.patch

@@ -1,22 +0,0 @@
-commit 64661de100da1ec1061ef3e5e400285dce115e6b
-Author: Felix Fietkau <nbd@openwrt.org>
-Date:   Sun May 10 13:16:35 2015 +0000
-
-    gcc: add some size optimization patches
-    
-    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-    
-    SVN-Revision: 45664
-
---- a/libgcc/config/t-libunwind
-+++ b/libgcc/config/t-libunwind
-@@ -2,8 +2,7 @@
- 
- HOST_LIBGCC2_CFLAGS += -DUSE_GAS_SYMVER
- 
--LIB2ADDEH = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c \
--  $(srcdir)/unwind-compat.c $(srcdir)/unwind-dw2-fde-compat.c
-+LIB2ADDEH = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
- LIB2ADDEHSTATIC = $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
- 
- # Override the default value from t-slibgcc-elf-ver and mention -lunwind

devel/gcc/patches/12.3.0/870-ppc_no_crtsavres.patch

@@ -1,11 +0,0 @@
---- a/gcc/config/rs6000/rs6000-logue.cc
-+++ b/gcc/config/rs6000/rs6000-logue.cc
-@@ -348,7 +348,7 @@ rs6000_savres_strategy (rs6000_stack_t *
-   /* Define cutoff for using out-of-line functions to save registers.  */
-   if (DEFAULT_ABI == ABI_V4 || TARGET_ELF)
-     {
--      if (!optimize_size)
-+      if (1)
- 	{
- 	  strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS;
- 	  strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS;

devel/gcc/patches/12.3.0/881-no_tm_section.patch

@@ -1,11 +0,0 @@
---- a/libgcc/crtstuff.c
-+++ b/libgcc/crtstuff.c
-@@ -152,7 +152,7 @@ call_ ## FUNC (void)					\
- #endif
- 
- #if !defined(USE_TM_CLONE_REGISTRY) && defined(OBJECT_FORMAT_ELF)
--# define USE_TM_CLONE_REGISTRY 1
-+# define USE_TM_CLONE_REGISTRY 0
- #elif !defined(USE_TM_CLONE_REGISTRY)
- # define USE_TM_CLONE_REGISTRY 0
- #endif

devel/gcc/patches/12.3.0/900-bad-mips16-crt.patch

@@ -1,9 +0,0 @@
---- a/libgcc/config/mips/t-mips16
-+++ b/libgcc/config/mips/t-mips16
-@@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16
- 
- # Version these symbols if building libgcc.so.
- SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver
-+
-+CRTSTUFF_T_CFLAGS += -mno-mips16
-+CRTSTUFF_T_CFLAGS_S += -mno-mips16

devel/gcc/patches/12.3.0/910-mbsd_multi.patch

@@ -1,146 +0,0 @@
-commit 99368862e44740ff4fd33760893f04e14f9dbdf1
-Author: Felix Fietkau <nbd@openwrt.org>
-Date:   Tue Jul 31 00:52:27 2007 +0000
-
-    Port the mbsd_multi patch from freewrt, which adds -fhonour-copts. This will emit warnings in packages that don't use our target cflags properly
-    
-    SVN-Revision: 8256
-
-	This patch brings over a feature from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-family/c-opts.cc
-+++ b/gcc/c-family/c-opts.cc
-@@ -107,6 +107,9 @@ static dump_flags_t original_dump_flags;
- /* Whether any standard preincluded header has been preincluded.  */
- static bool done_preinclude;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
- static void set_std_cxx11 (int);
-@@ -478,6 +481,12 @@ c_common_handle_option (size_t scode, co
-       flag_no_builtin = !value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+        honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fconstant_string_class_:
-       constant_string_class_name = arg;
-       break;
-@@ -1218,6 +1227,47 @@ c_common_init (void)
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in lenient mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        warning (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in strict mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        error ("someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+        return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+        inform (UNKNOWN_LOCATION, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -1755,6 +1755,9 @@ C++ ObjC++ Optimization Alias(fexception
- fhonor-std
- C++ ObjC++ WarnRemoved
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment.
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -1770,6 +1770,9 @@ fharden-conditional-branches
- Common Var(flag_harden_conditional_branches) Optimization
- Harden conditional branches by checking reversed conditions.
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9596,6 +9596,17 @@ This option is only supported for C and
- @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+@item -fhonour-copts
-+@opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
---- a/gcc/opts.cc
-+++ b/gcc/opts.cc
-@@ -2699,6 +2699,9 @@ common_handle_option (struct gcc_options
-       add_comma_separated_to_vector (&opts->x_flag_ignored_attributes, arg);
-       break;
- 
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Werror:
-       dc->warning_as_error_requested = value;
-       break;

devel/gcc/patches/12.3.0/920-specs_nonfatal_getenv.patch

@@ -1,22 +0,0 @@
-Author: Jo-Philipp Wich <jow@openwrt.org>
-Date:   Sat Apr 21 03:02:39 2012 +0000
-
-    gcc: add patch to make the getenv() spec function nonfatal if requested environment variable is unset
-    
-    SVN-Revision: 31390
-
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -10186,8 +10186,10 @@ getenv_spec_function (int argc, const ch
-     }
- 
-   if (!value)
--    fatal_error (input_location,
--		 "environment variable %qs not defined", varname);
-+    {
-+      warning (input_location, "environment variable %qs not defined", varname);
-+      value = "";
-+    }
- 
-   /* We have to escape every character of the environment variable so
-      they are not interpreted as active spec characters.  A

devel/gcc/patches/12.3.0/960-gotools-fix-compilation-when-making-cross-compiler.patch

@@ -1,67 +0,0 @@
-From dda6b050cd74a352670787a294596a9c56c21327 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Fri, 4 May 2018 18:20:53 +0800
-Subject: [PATCH] gotools: fix compilation when making cross compiler
-
-libgo is "the runtime support library for the Go programming language.
-This library is intended for use with the Go frontend."
-
-gccgo will link target files with libgo.so which depends on libgcc_s.so.1, but
-the linker will complain that it cannot find it.  That's because shared libgcc
-is not present in the install directory yet.  libgo.so was made without problem
-because gcc will emit -lgcc_s when compiled with -shared option.  When gotools
-were being made, it was supplied with -static-libgcc thus no link option was
-provided.  Check LIBGO in gcc/go/gcc-spec.c for how gccgo make a builtin spec
-for linking with libgo.so
-
-- GccgoCrossCompilation, https://github.com/golang/go/wiki/GccgoCrossCompilation
-- Cross-building instructions, http://www.eglibc.org/archives/patches/msg00078.html
-
-When 3-pass GCC compilation is used, shared libgcc runtime libraries will be
-available after gcc pass2 completed and will meet the gotools link requirement
-at gcc pass3
----
- gotools/Makefile.am | 4 +++-
- gotools/Makefile.in | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/gotools/Makefile.am
-+++ b/gotools/Makefile.am
-@@ -26,6 +26,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
- STAMP = echo timestamp >
- 
- libgodir = ../$(target_noncanonical)/libgo
-+libgccdir = ../$(target_noncanonical)/libgcc
- LIBGODEP = $(libgodir)/libgo.la
- 
- LIBGOTOOL = $(libgodir)/libgotool.a
-@@ -41,7 +42,8 @@ GOCFLAGS = $(CFLAGS_FOR_TARGET)
- GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
- 
- AM_GOCFLAGS = -I $(libgodir)
--AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
-+AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs \
-+	-L $(libgccdir) -L $(libgccdir)/.libs -lgcc_s
- GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
- 
- libgosrcdir = $(srcdir)/../libgo/go
---- a/gotools/Makefile.in
-+++ b/gotools/Makefile.in
-@@ -337,6 +337,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
- PWD_COMMAND = $${PWDCMD-pwd}
- STAMP = echo timestamp >
- libgodir = ../$(target_noncanonical)/libgo
-+libgccdir = ../$(target_noncanonical)/libgcc
- LIBGODEP = $(libgodir)/libgo.la
- LIBGOTOOL = $(libgodir)/libgotool.a
- @NATIVE_FALSE@GOCOMPILER = $(GOC)
-@@ -346,7 +347,8 @@ LIBGOTOOL = $(libgodir)/libgotool.a
- GOCFLAGS = $(CFLAGS_FOR_TARGET)
- GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
- AM_GOCFLAGS = -I $(libgodir)
--AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
-+AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs \
-+	-L $(libgccdir) -L $(libgccdir)/.libs -lgcc_s
- GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
- libgosrcdir = $(srcdir)/../libgo/go
- cmdsrcdir = $(libgosrcdir)/cmd

devel/gcc/patches/12.3.0/970-macos_arm64-building-fix.patch

@@ -1,45 +0,0 @@
-commit 9c6e71079b46ad5433165feaa2001450f2017b56
-Author: Przemysław Buczkowski <prem@prem.moe>
-Date:   Mon Aug 16 13:16:21 2021 +0100
-
-    GCC: Patch for Apple Silicon compatibility
-    
-    This patch fixes a linker error occuring when compiling
-    the cross-compiler on macOS and ARM64 architecture.
-    
-    Adapted from:
-    https://github.com/richfelker/musl-cross-make/issues/116#issuecomment-823612404
-    
-    Change-Id: Ia3ee98a163bbb62689f42e2da83a5ef36beb0913
-    Reviewed-on: https://review.haiku-os.org/c/buildtools/+/4329
-    Reviewed-by: John Scipione <jscipione@gmail.com>
-    Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
-
---- a/gcc/config/aarch64/aarch64.h
-+++ b/gcc/config/aarch64/aarch64.h
-@@ -1293,7 +1293,7 @@ extern const char *aarch64_rewrite_mcpu
- #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
-   { "rewrite_mcpu", aarch64_rewrite_mcpu },
- 
--#if defined(__aarch64__)
-+#if defined(__aarch64__) && ! defined(__APPLE__)
- extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define HAVE_LOCAL_CPU_DETECT
- # define EXTRA_SPEC_FUNCTIONS						\
---- a/gcc/config/host-darwin.cc
-+++ b/gcc/config/host-darwin.cc
-@@ -23,6 +23,8 @@
- #include "options.h"
- #include "diagnostic-core.h"
- #include "config/host-darwin.h"
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
- #include <errno.h>
- 
- /* For Darwin (macOS only) platforms, without ASLR (PIE) enabled on the
-@@ -181,3 +183,5 @@ darwin_gt_pch_use_address (void *&addr,
- 
-   return 1;
- }
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;

devel/gitlab-runner/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gitlab-runner
-PKG_VERSION:=16.0.2
-PKG_RELEASE:=1
+PKG_VERSION:=14.3.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(PKG_VERSION)
-PKG_HASH:=f874b9babe21ae04007abfc901e9ad4c0c1ec22095d4de3e22e176914683cb5d
+PKG_HASH:=f67aeae05349f5c612ea5d8772407237caf4da586c0365e3c7edceec6b853d8c
 
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
@@ -22,10 +22,8 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DIR:=$(BUILD_DIR)/gitlab-runner-v$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
-
+PKG_USE_MIPS16:=0
 GO_PKG:=gitlab.com/gitlab-org/gitlab-runner
-GO_PKG_LDFLAGS_X:=$(GO_PKG)/common.VERSION=$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
@@ -43,12 +41,5 @@ define Package/gitlab-runner/description
   GitLab CI/CD to run jobs in a pipeline.
 endef
 
-define Package/gitlab-runner/install
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gitlab-runner $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gitlab-runner-helper $(1)/usr/bin/
-endef
-
 $(eval $(call GoBinPackage,gitlab-runner))
 $(eval $(call BuildPackage,gitlab-runner))

devel/gitlab-runner/patches/010-test.patch

@@ -1,6 +1,6 @@
 --- a/common/buildtest/masking.go
 +++ b/common/buildtest/masking.go
-@@ -55,7 +55,7 @@ func RunBuildWithMasking(t *testing.T, c
+@@ -45,7 +45,7 @@ func RunBuildWithMasking(t *testing.T, c
  
  	buf.Finish()
  

devel/gitlab-runner/test.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-gitlab-runner --version | grep "$PKG_VERSION"

devel/lttng-modules/Makefile

@@ -8,19 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lttng-modules
-PKG_VERSION:=2.13.9
+PKG_VERSION:=2.10.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_HASH:=bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581
+PKG_HASH:=fe1d269bca723e8948af871c322c37d3900e647cdc5eb3efbe821e434beee44c
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1 GPL-2.0 MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,17 +26,19 @@ define KernelPackage/lttng
   SUBMENU:=Other modules
   TITLE:=Linux Trace Toolkit: next generation (kernel modules)
   URL:=https://lttng.org/
-  DEPENDS:=@!TARGET_uml @KERNEL_FTRACE_SYSCALLS @KERNEL_KPROBES
+  DEPENDS:= @!TARGET_uml @KERNEL_FTRACE_SYSCALLS
   FILES:= \
-	$(PKG_BUILD_DIR)/src/lttng-*.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/src/lib/lttng-*.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/src/probes/lttng-*.$(LINUX_KMOD_SUFFIX)
+	$(PKG_BUILD_DIR)/lttng-*.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/lib/lttng-*.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/probes/lttng-*.$(LINUX_KMOD_SUFFIX)
 endef
 
 define Build/Compile
-	+$(KERNEL_MAKE) $(PKG_JOBS) \
+	$(MAKE) -C "$(LINUX_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		M="$(PKG_BUILD_DIR)" \
-		CONFIG_LTTNG=m \
+		V="$(V)" \
 		modules
 endef
 

devel/lttng-tools/Makefile

@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lttng-tools
-PKG_VERSION:=2.13.9
-PKG_RELEASE:=1
+PKG_VERSION:=2.12.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_HASH:=8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337
+PKG_HASH:=0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_FLAGS:=no-mips16
+PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 

devel/lttng-tools/patches/010-compat-off64_t-is-not-defined-by-musl.patch

@@ -1,78 +0,0 @@
-From 57fd993799a2b081c826f6fc8def32d28d526bfb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
- <jeremie.galarneau@efficios.com>
-Date: Tue, 17 Jan 2023 16:57:35 -0500
-Subject: [PATCH] compat: off64_t is not defined by musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This helps compile with latest musl, where off64_t is not defined unless
-_LARGEFILE64_SOURCE is defined. On glibc, _LARGEFILE64_SOURCE is defined
-if _GNU_SOURCE is defined, so the problem is only seen with musl.
-
-Since the project uses AC_SYS_LARGEFILE, which from the autoconf doc:
-"arrange for 64-bit file offsets, known as large-file support."
-
-As such, it is safe to assume off_t is 64-bit wide. This is checked by a
-static_assert to catch any platform where autoconf would let a 32-bit
-off_t slip.
-
-Reported-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8
----
- src/common/compat/compat-fcntl.cpp |  2 +-
- src/common/compat/fcntl.hpp        | 11 +++++------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
---- a/src/common/compat/compat-fcntl.c
-+++ b/src/common/compat/compat-fcntl.c
-@@ -13,7 +13,7 @@
- #ifdef __linux__
- 
- LTTNG_HIDDEN
--int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-+int compat_sync_file_range(int fd, off_t offset, off_t nbytes,
- 		unsigned int flags)
- {
- #ifdef HAVE_SYNC_FILE_RANGE
---- a/src/common/compat/fcntl.h
-+++ b/src/common/compat/fcntl.h
-@@ -8,21 +8,21 @@
- #ifndef _COMPAT_FCNTL_H
- #define _COMPAT_FCNTL_H
- 
-+#include <assert.h>
- #include <fcntl.h>
- #include <sys/types.h>
- 
- #include <common/compat/errno.h>
- 
--#if (defined(__CYGWIN__))
--typedef long long off64_t;
--#endif
-+static_assert(sizeof(off_t) == sizeof(int64_t),
-+	      "Build system is misconfigured, off_t must be 64-bit wide");
- 
- #if (defined(__FreeBSD__) || defined(__sun__))
- typedef off64_t loff_t;
- #endif
- 
- #ifdef __linux__
--extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-+extern int compat_sync_file_range(int fd, off_t offset, off_t nbytes,
- 		unsigned int flags);
- #define lttng_sync_file_range(fd, offset, nbytes, flags) \
- 	compat_sync_file_range(fd, offset, nbytes, flags)
-@@ -37,8 +37,8 @@ extern int compat_sync_file_range(int fd
- #define SYNC_FILE_RANGE_WAIT_BEFORE   0
- #define SYNC_FILE_RANGE_WRITE         0
- 
--static inline int lttng_sync_file_range(int fd, off64_t offset,
--		off64_t nbytes, unsigned int flags)
-+static inline int lttng_sync_file_range(int fd, off_t offset,
-+		off_t nbytes, unsigned int flags)
- {
- 	return -ENOSYS;
- }

devel/m4/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=m4
 PKG_VERSION:=1.4.19
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_URL:=@GNU/m4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz

devel/nasm/Makefile

@@ -1,41 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nasm
-PKG_VERSION:=2.16.01
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
-
-PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nasm
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=nasm assembler
-  DEPENDS:=@TARGET_x86
-endef
-
-define Package/nasm/description
-  NASM, the Netwide Assembler: an assembler targetting the
-  Intel x86 series of processors, with portable source.
-endef
-
-CONFIGURE_ARGS += --disable-lto --disable-werror --disable-gdb
-
-define Package/nasm/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisasm $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nasm $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,nasm))

devel/packr/Makefile

@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2020 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=packr
+PKG_VERSION:=1.30.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/gobuffalo/packr.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=fe199299e6b7236cf9538c06d27ab1a4efd93cda2b3ea85bab9154be364760c8
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.txt
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+
+HOST_BUILD_DEPENDS:=golang/host
+HOST_BUILD_PARALLEL:=1
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/gobuffalo/packr
+GO_PKG_BUILD_PKG:=github.com/gobuffalo/packr/packr
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-host-build.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/packr
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=Embed static files into Go binaries
+  URL:=https://github.com/gobuffalo/packr
+  DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/packr/description
+  Packr is a simple solution for bundling static assets inside of Go
+  binaries. Most importantly it does it in a way that is friendly to
+  developers while they are developing.
+endef
+
+$(eval $(call GoBinHostBuild))
+$(eval $(call HostBuild))
+$(eval $(call GoBinPackage,packr))
+$(eval $(call BuildPackage,packr))

devel/patch/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=patch
 PKG_VERSION:=2.7.6
-PKG_RELEASE:=7
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/patch

devel/patch/patches/020-CVE-2018-1000156.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Fix arbitrary command execution in ed-style patches
 of piping it to ed: this will cause ed to abort on invalid commands
 instead of rejecting them and carrying on.
 * tests/ed-style: New test case.
-* tests/Makefile.am (TESTS): Add test case. (OPENWRT REMOVED)
+* tests/Makefile.am (TESTS): Add test case.
 ---
  src/pch.c         | 89 +++++++++++++++++++++++++++++++++++------------
- tests/Makefile.am |  1 + (OPENWRT REMOVED)
+ tests/Makefile.am |  1 +
  tests/ed-style    | 41 ++++++++++++++++++++++
  3 files changed, 108 insertions(+), 23 deletions(-)
  create mode 100644 tests/ed-style
@@ -143,6 +143,16 @@ instead of rejecting them and carrying on.
  
      if (ofp)
        {
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -32,6 +32,7 @@ TESTS = \
+ 	crlf-handling \
+ 	dash-o-append \
+ 	deep-directories \
++	ed-style \
+ 	empty-files \
+ 	false-match \
+ 	fifo \
 --- /dev/null
 +++ b/tests/ed-style
 @@ -0,0 +1,41 @@

devel/pkgconf/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkgconf
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
@@ -17,6 +17,8 @@ PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk
 

devel/ragel/Makefile

@@ -1,37 +0,0 @@
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ragel
-PKG_VERSION:=6.10
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=https://www.colm.net/files/ragel/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
-
-PKG_MAINTAINER:=John Audia <therealgraysky@proton.me>
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=COPYING
-
-PKG_HOST_ONLY:=1
-HOST_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ragel
-  SECTION:=devel
-  CATEGORY:=Development
-  TITLE:=Compiles finite state machines from regular languages into executable code
-  URL:=https://www.colm.net/open-source/ragel/
-  BUILDONLY:=1
-endef
-
-HOST_CONFIGURE_VARS += CXXFLAGS="$(HOST_CXXFLAGS) -std=gnu++98"
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,ragel))