lots of stuff

This commit is contained in:
Ella Stanforth 2021-12-26 12:40:14 +00:00
parent 32d66a7f56
commit b859e777d0
91 changed files with 2156 additions and 532 deletions

View file

@ -1,8 +1,7 @@
pkgver=20210420
pkgver=20211024
pkgname=bmake
mkdeps=""
deps=""
ext="doc"
fetch() {
curl http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz -o $pkgname-$pkgver.tar.gz
@ -23,12 +22,10 @@ package() {
cd $pkgname-$pkgver
./bmake -m ./mk install DESTDIR=$pkgdir
ln -sr $pkgdir/usr/bin/bmake $pkgdir/usr/bin/make
rm -r $pkgdir/usr/share/man
}
package_doc() {
cd $pkgname-$pkgver
install -Dm644 ./bmake.1 $pkgdir/usr/share/man/man1/bmake.1
backup() {
return
}
license() {

View file

@ -1,11 +1,11 @@
--- ../bmakeb/bmake/boot-strap 2020-11-13 21:47:25.000000000 +0000
+++ boot-strap 2020-12-27 17:26:13.126598658 +0000
@@ -431,7 +431,7 @@
--- a/boot-strap
+++ b/boot-strap
@@ -420,7 +420,7 @@
op_test() {
[ -x bmake ] || op_build
- Bmake test || exit 1
+ #Bmake test || exit 1
- Bmake test "$@" || exit 1
+ #Bmake test "$@" || exit 1
}
op_clean() {

View file

@ -1,9 +1,8 @@
pkgver=20210802
pkgver=20210808
pkgname=byacc
deps=""
mkdeps="bmake"
bad=""
ext="doc"
fetch() {
curl https://invisible-island.net/datafiles/release/byacc.tar.gz -o $pkgname-$pkgver.tar.gz
@ -26,13 +25,10 @@ package() {
cd $pkgname-$pkgver
make install DESTDIR=$pkgdir
ln -sr $pkgdir/usr/bin/byacc $pkgdir/usr/bin/yacc
rm -r $pkgdir/usr/share
}
package_doc() {
cd $pkgname-$pkgver
make install DESTDIR=$pkgdir
rm -r $pkgdir/usr/bin
backup() {
}
license() {

View file

@ -1,59 +0,0 @@
pkgname=ca-certificates
pkgver=202200601
pkgrel=2
ext=doc
mkdeps="gmake"
deps="libressl"
bad="gmake"
fetch(){
curl http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20200601~deb10u2.tar.xz -o $pkgname-$pkgver.tar.gz
tar -xf $pkgname-$pkgver.tar.gz
mv work $pkgname-$pkgver
cd $pkgname-$pkgver
#patch -p1 < ../../libressl-update-rehash.patch
}
build() {
cd $pkgname-$pkgver
bad --gmake gmake
}
package() {
cd $pkgname-$pkgver
mkdir -p $pkgdir/usr/bin
mkdir -p $pkgdir/usr/sbin
mkdir -p $pkgdir/etc/ssl/
mkdir -p $pkgdir/etc/ca-certificates/update.d
mkdir -p $pkgdir/usr/share/ca-certificates/
bad --gmake gmake install DESTDIR="$pkgdir"
(
echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
echo "# $(date -u)"
echo "# Do not edit."
cd "$pkgdir"/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3-
) > "$pkgdir"/etc/ca-certificates.conf
cat > "$pkgdir"/etc/ca-certificates/update.d/certhash <<-EOF
#!/bin/sh
exec openssl certhash /etc/ssl/certs
EOF
cat "$pkgdir"/usr/share/ca-certificates/mozilla/*.crt > $pkgdir/etc/ssl/cert.pem
chmod +x "$pkgdir"/etc/ca-certificates/update.d/certhash
}
package_doc() {
cd $pkgname-$pkgver
install -d $pkgdir/usr/share/man/man8
install -Dm644 ./sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8
}
license() {
cd $pkgname-$pkgver
cat debian/copyright
}

View file

@ -1,14 +0,0 @@
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -183,9 +183,9 @@
done
if [ "$verbose" = 0 ]
then
- openssl rehash . > /dev/null
+ openssl certhash . > /dev/null
else
- openssl rehash -v .
+ openssl certhash -v .
fi
fi

View file

@ -1,4 +1,4 @@
pkgver=7.77.0
pkgver=7.79.0
pkg_ver=$(echo $pkgver | tr '.' '_')
pkgname=curl
pkgrel=1
@ -19,8 +19,7 @@ build() {
cmake -G Ninja ../ \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
-DCMAKE_INSTALL_LIBDIR=lib
samu
}

BIN
base/curl/f Normal file

Binary file not shown.

View file

@ -13,7 +13,8 @@ fetch() {
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr
./configure --prefix=/usr \
--without-pam
gmake
}

30
base/fakeroot/build.sh Normal file
View file

@ -0,0 +1,30 @@
pkgname=fakeroot
pkgver=1.26
fetch() {
curl "https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
patch -p1 < ../../no64.patch
patch -p1 < ../../stdint.patch
}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
--build=$TRIPLE \
--host=$TRIPLE
gmake
}
package() {
cd $pkgname-$pkgver
gmake install DESTDIR=$pkgdir
}
license() {
cd $pkgname-$pkgver
cat LICENSE
# cat COPYING
}

17
base/fakeroot/no64.patch Normal file
View file

@ -0,0 +1,17 @@
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -81,12 +81,14 @@
#define SEND_STAT64(a,b,c) send_stat64(a,b,c)
#define SEND_GET_STAT(a,b) send_get_stat(a,b)
#define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
#define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
#else
#define SEND_STAT(a,b,c) send_stat(a,b)
#define SEND_STAT64(a,b,c) send_stat64(a,b)
#define SEND_GET_STAT(a,b) send_get_stat(a)
#define SEND_GET_STAT64(a,b) send_get_stat64(a)
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
#define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
#endif

View file

@ -0,0 +1,34 @@
--- a/faked.c
+++ b/faked.c
@@ -514,11 +514,11 @@
#ifdef FAKEROOT_DB_PATH
if (find_path(i->buf.dev, i->buf.ino, roots, path))
- fprintf(f,"mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu %s\n",
+ fprintf(f,"mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" %s\n",
(uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,
(uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path);
#else
- fprintf(f,"dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
+ fprintf(f,"dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
(uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode,
(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink,
(uint64_t) i->buf.rdev);
@@ -544,7 +544,7 @@
while(1){
#ifdef FAKEROOT_DB_PATH
- r=scanf("mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu "DB_PATH_SCAN"\n",
+ r=scanf("mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" "DB_PATH_SCAN"\n",
&stmode, &stuid, &stgid, &stnlink, &strdev, &path);
if (r != 6)
break;
@@ -559,7 +559,7 @@
stdev = path_st.st_dev;
stino = path_st.st_ino;
#else
- r=scanf("dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
+ r=scanf("dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
&stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev);
if (r != 7)
break;

View file

@ -19,6 +19,7 @@ build() {
package() {
cd $pkgname-$pkgver
make install DESTDIR=$pkgdir
ln -sr $pkgdir/usr/bin/flex $pkgdir/usr/bin/lex
}
license() {

View file

@ -1,4 +1,4 @@
pkgver=12.0.1
pkgver=13.0.0
pkgname=llvm
bad=""
ext="dev"

View file

@ -1,8 +1,7 @@
pkgver=0.58.1
pkgver=0.60.2
pkgname=meson
deps=python
bad=""
ext="doc"
fetch() {
curl -L "https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
@ -22,8 +21,8 @@ package() {
python setup.py install --prefix=/usr --root=$pkgdir
}
package_doc() {
echo $pkgdir
backup() {
return
}
license() {

View file

@ -1,5 +1,5 @@
pkgname=openssh
pkgver=8.6p1
pkgver=8.8p1
fetch() {
curl "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
@ -10,8 +10,8 @@ build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
--build=x86_64-unknown-linux-musl \
--host=x86_64-unknown-linux-musl \
--build=$TRIPLE \
--host=$TRIPLE \
--libexecdir=/usr/lib
make
@ -22,6 +22,10 @@ package() {
make install DESTDIR=$pkgdir
}
backup() {
return
}
license() {
cd $pkgname-$pkgver
cat LICENCE

View file

@ -21,20 +21,14 @@ build() {
no-seed no-weak-ssl-ciphers \
-Wa,--noexecstack
make
make CC=cc
}
package() {
cd $pkgname-$pkgver
make install_sw DESTDIR=$pkgdir
rm -rf $pkgdir/usr/lib/pkgconf
rm -rf $pkgdir/usr/include
}
package_dev() {
cd $pkgname-$pkgver
make install_sw DESTDIR=$pkgdir
rm -rf $pkgdir/usr/bin
make install_sw install_ssldir DESTDIR=$pkgdir
install -d $pkgdir/usr/sbin
install -Dm755 ../../update-ca.sh $pkgdir/usr/sbin/update-ca
}
license() {

4
base/openssl/update-ca.sh Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
cd /etc/ssl && {
curl -LO https://curl.haxx.se/ca/cacert.pem -o /etc/ssl/certs/ca-certificates.crt
}

View file

@ -1,30 +0,0 @@
pkgver=2.2
pkgname=pci-ids
pkgrel=1
bad=""
ext=""
fetch() {
mkdir $pkgname-$pkgver
cd $pkgname-$pkgver
curl "https://pci-ids.ucw.cz/v2.2/pci.ids" -o pci.ids
}
build() {
cd $pkgname-$pkgver
echo "Nothing to do"
}
package() {
cd $pkgname-$pkgver
install -d $pkgdir/usr/share/misc
install -Dm 644 pci.ids $pkgdir/usr/share/misc
}
license() {
cd $pkgname-$pkgver
echo "The contents of the database and the generated files can be distributed"
echo "under the terms of either the GNU General Public License (version 2 or later)"
echo "or of the 3-clause BSD License. The database is a compilation of factual data,"
echo "and as such the copyright only covers the aggregation and formatting."
}

View file

@ -1,8 +1,8 @@
pkgname=perl
pkgver=5.32.1
pkgver=5.34.0
fetch() {
curl "https://www.cpan.org/src/5.0/perl-5.32.1.tar.gz" -o $pkgname-$pkgver.tar.xz
curl "https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
}
@ -47,6 +47,10 @@ package() {
rm -rf $pkgdir/usr/share/man
}
backup() {
return
}
license() {
cd $pkgname-$pkgver
cat Copying

View file

@ -1,5 +1,5 @@
pkgname=python
pkgver=3.9.6
pkgver=3.9.7
bad=""
ext="doc"

View file

@ -1,11 +1,12 @@
pkgver=0.8.5
pkgver=0.8.6
pkgname=toybox
pkgrel=1
deps="musl:pci-ids"
deps="musl"
fetch() {
curl "http://www.landley.net/toybox/downloads/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
tar -xf $pkgname-$pkgver.tar.gz
curl "https://pci-ids.ucw.cz/v2.2/pci.ids" -o pci.ids
cd $pkgname-$pkgver
patch -p1 < ../../ls-colour.patch
patch -p1 < ../../mksh-make.patch
@ -18,7 +19,14 @@ build() {
CPUS=1 bad --gmake gmake
}
backup() {
return
}
package() {
install -d $pkgdir/usr/share/misc
install -Dm 644 pci.ids $pkgdir/usr/share/misc
cd $pkgname-$pkgver
# install -d $pkgdir/bin
# install -Dm755 ./toybox $pkgdir/bin/

View file

@ -1,5 +1,3 @@
diff --git a/scripts/make.sh b/scripts/make.sh
index 5b2d5d81..2c5e4b93 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -106,8 +106,7 @@ genbuildsh()
@ -12,3 +10,25 @@ index 5b2d5d81..2c5e4b93 100755
then
echo -n "Library probe"
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -16,7 +16,7 @@ probecc()
# Symbol name is first argument, flags second, feed C file to stdin
probesymbol()
{
- probecc "${@:2}" 2>/dev/null && DEFAULT=y || DEFAULT=n
+ probecc $2 2>/dev/null && DEFAULT=y || DEFAULT=n
rm a.out 2>/dev/null
echo -e "config $1\n\tbool" || exit 1
echo -e "\tdefault $DEFAULT\n" || exit 1
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -15,7 +15,7 @@ if [ ! -z "$ASAN" ]; then
fi
# Centos 7 bug workaround, EOL June 30 2024.
-DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
+unset DASHN
export LANG=c
export LC_ALL=C

View file

@ -1,5 +1,21 @@
--- a/toys/other/xxd.c
+++ b/toys/other/xxd.c
@@ -77,11 +77,13 @@ static void do_xxd(int fd, char *name)
static void do_xxd_include(int fd, char *name)
{
+ long long total = 0;
int c = 1, i, len;
// The original xxd outputs a header/footer if given a filename (not stdin).
// We don't, which means that unlike the original we can implement -ri.
while ((len = read(fd, toybuf, sizeof(toybuf))) > 0) {
+ total += len;
for (i = 0; i < len; ++i) {
printf("%s%#.02x", c > 1 ? ", " : " ", toybuf[i]);
if (c++ == TT.c) {
--- a/toys/other/xxd.c
+++ b/toys/other/xxd.c
@@ -80,7 +80,12 @@
int c = 1, i, len;