From 7a7a96afa757ede639ae8777cd3a62a27bef2efc Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Mon, 7 Feb 2022 13:20:11 -0400 Subject: [PATCH] Repackage gavin-bc to not use a git-based source. Probably some other stuff I'm forgetting. --- .../official/core/gavin-bc-git/JUSTIFICATION | 1 - ports/official/core/gavin-bc-git/build | 7 ------ ports/official/core/gavin-bc-git/sources | 1 - ports/official/core/gavin-bc-git/version | 1 - ports/official/core/gavin-bc/build | 10 +++++++++ ports/official/core/gavin-bc/checksums | 1 + ports/official/core/gavin-bc/sources | 1 + ports/official/core/gavin-bc/version | 1 + ports/official/core/shadow/build | 8 ++++--- ports/official/core/shadow/checksums | 2 +- ports/official/core/shadow/sources | 2 +- ports/official/core/shadow/version | 2 +- ports/official/core/util-linux/build | 7 +++++- ports/unofficial/stable/shadow/build | 22 ------------------- ports/unofficial/stable/shadow/checksums | 1 - ports/unofficial/stable/shadow/sources | 1 - ports/unofficial/stable/shadow/version | 1 - 17 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 ports/official/core/gavin-bc-git/JUSTIFICATION delete mode 100755 ports/official/core/gavin-bc-git/build delete mode 100644 ports/official/core/gavin-bc-git/sources delete mode 100644 ports/official/core/gavin-bc-git/version create mode 100755 ports/official/core/gavin-bc/build create mode 100644 ports/official/core/gavin-bc/checksums create mode 100644 ports/official/core/gavin-bc/sources create mode 100644 ports/official/core/gavin-bc/version delete mode 100755 ports/unofficial/stable/shadow/build delete mode 100644 ports/unofficial/stable/shadow/checksums delete mode 100644 ports/unofficial/stable/shadow/sources delete mode 100644 ports/unofficial/stable/shadow/version diff --git a/ports/official/core/gavin-bc-git/JUSTIFICATION b/ports/official/core/gavin-bc-git/JUSTIFICATION deleted file mode 100644 index df4ed07..0000000 --- a/ports/official/core/gavin-bc-git/JUSTIFICATION +++ /dev/null @@ -1 +0,0 @@ -There isn't actually anything wrong with Gavin's implementation of bc/dc; it's a great program and perfectly suitable for daily use. For whatever reason it can sometimes fail to build when using my standard userland; the solution to this is to indent any src lines with tabs diff --git a/ports/official/core/gavin-bc-git/build b/ports/official/core/gavin-bc-git/build deleted file mode 100755 index 036cfd3..0000000 --- a/ports/official/core/gavin-bc-git/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -./configure \ - --prefix=/usr - -make -make DESTDIR="$1" install diff --git a/ports/official/core/gavin-bc-git/sources b/ports/official/core/gavin-bc-git/sources deleted file mode 100644 index 6708d38..0000000 --- a/ports/official/core/gavin-bc-git/sources +++ /dev/null @@ -1 +0,0 @@ -git+https://git.yzena.com/gavin/bc diff --git a/ports/official/core/gavin-bc-git/version b/ports/official/core/gavin-bc-git/version deleted file mode 100644 index a383ea1..0000000 --- a/ports/official/core/gavin-bc-git/version +++ /dev/null @@ -1 +0,0 @@ -git 1 diff --git a/ports/official/core/gavin-bc/build b/ports/official/core/gavin-bc/build new file mode 100755 index 0000000..4798da9 --- /dev/null +++ b/ports/official/core/gavin-bc/build @@ -0,0 +1,10 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr \ + --disable-nls \ + --disable-generated-tests \ + --enable-memcheck + +make +make DESTDIR="$1" install diff --git a/ports/official/core/gavin-bc/checksums b/ports/official/core/gavin-bc/checksums new file mode 100644 index 0000000..53925ff --- /dev/null +++ b/ports/official/core/gavin-bc/checksums @@ -0,0 +1 @@ +42a3257ea71eecc2c39349cedfefc57c168b4ebb47cf43cae54e962374988b45 diff --git a/ports/official/core/gavin-bc/sources b/ports/official/core/gavin-bc/sources new file mode 100644 index 0000000..8750bd6 --- /dev/null +++ b/ports/official/core/gavin-bc/sources @@ -0,0 +1 @@ +https://git.yzena.com/gavin/bc/archive/5.2.2.tar.gz diff --git a/ports/official/core/gavin-bc/version b/ports/official/core/gavin-bc/version new file mode 100644 index 0000000..b060628 --- /dev/null +++ b/ports/official/core/gavin-bc/version @@ -0,0 +1 @@ +5.2.2 1 diff --git a/ports/official/core/shadow/build b/ports/official/core/shadow/build index 4e550f4..7bb8773 100755 --- a/ports/official/core/shadow/build +++ b/ports/official/core/shadow/build @@ -7,12 +7,14 @@ --libdir=/usr/lib \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --disable-man \ --disable-account-tools-setuid \ - --with-group-name-max-length=32 \ --without-audit \ + --disable-nls \ --without-selinux \ - --without-libpam + --without-libpam \ + --enable-shadowgrp \ + --enable-utmpx \ + --with-group-name-max-length=32 make make DESTDIR="$1" install diff --git a/ports/official/core/shadow/checksums b/ports/official/core/shadow/checksums index 38175d0..b317e2f 100644 --- a/ports/official/core/shadow/checksums +++ b/ports/official/core/shadow/checksums @@ -1 +1 @@ -a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 +41f093ce58b2ae5f389a1c5553e0c18bc73e6fe27f66273891991198a7707c95 diff --git a/ports/official/core/shadow/sources b/ports/official/core/shadow/sources index f0d99ec..a709fba 100644 --- a/ports/official/core/shadow/sources +++ b/ports/official/core/shadow/sources @@ -1 +1 @@ -https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz +https://github.com/shadow-maint/shadow/releases/download/v4.11.1/shadow-4.11.1.tar.xz diff --git a/ports/official/core/shadow/version b/ports/official/core/shadow/version index e36f878..8a17014 100644 --- a/ports/official/core/shadow/version +++ b/ports/official/core/shadow/version @@ -1 +1 @@ -4.8.1 1 +4.11.1 1 diff --git a/ports/official/core/util-linux/build b/ports/official/core/util-linux/build index 405e982..dc29cc8 100755 --- a/ports/official/core/util-linux/build +++ b/ports/official/core/util-linux/build @@ -15,12 +15,17 @@ --enable-static-programs=fdisk,mount,umount \ --enable-libuuid \ --enable-libblkid \ + --enable-libfdisk \ + --enable-libsmartcols \ --enable-fsck \ --enable-uuidgen \ --enable-fstrim\ --enable-libmount \ + --enable-fdisks \ + --enable-mount \ --disable-bash-completion \ - --disable-colors-default + --disable-colors-default \ + --disable-nls make diff --git a/ports/unofficial/stable/shadow/build b/ports/unofficial/stable/shadow/build deleted file mode 100755 index 4e550f4..0000000 --- a/ports/unofficial/stable/shadow/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -e - -./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --disable-man \ - --disable-account-tools-setuid \ - --with-group-name-max-length=32 \ - --without-audit \ - --without-selinux \ - --without-libpam - -make -make DESTDIR="$1" install - -# Fix broken --sbindir. -mv -f "$1/usr/sbin/"* "$1/usr/bin" -rmdir "$1/usr/sbin" diff --git a/ports/unofficial/stable/shadow/checksums b/ports/unofficial/stable/shadow/checksums deleted file mode 100644 index 917abc8..0000000 --- a/ports/unofficial/stable/shadow/checksums +++ /dev/null @@ -1 +0,0 @@ -a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 shadow-4.8.1.tar.xz diff --git a/ports/unofficial/stable/shadow/sources b/ports/unofficial/stable/shadow/sources deleted file mode 100644 index f0d99ec..0000000 --- a/ports/unofficial/stable/shadow/sources +++ /dev/null @@ -1 +0,0 @@ -https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz diff --git a/ports/unofficial/stable/shadow/version b/ports/unofficial/stable/shadow/version deleted file mode 100644 index e36f878..0000000 --- a/ports/unofficial/stable/shadow/version +++ /dev/null @@ -1 +0,0 @@ -4.8.1 1