From d5ac8f05738477502bdd8620e7be536d07865089 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 19 Jul 2021 16:43:03 -0400 Subject: [opensysusers][libretools]: [REVERT] bcf93cb83 and ceabb79eb commits from bcf93cb83 to fbd84207c were WIP experiments including some that reverted important published changes none of those should have been published; but they were and abslibre is ff-only - so this commit undoes the reversions the other WIP commits in that range are not usable either; but they do move forward, so they may as well stay --- nonsystemd/libretools/PKGBUILD | 132 ++++++++++++++++++++++++--------------- nonsystemd/opensysusers/PKGBUILD | 58 ----------------- 2 files changed, 80 insertions(+), 110 deletions(-) delete mode 100644 nonsystemd/opensysusers/PKGBUILD diff --git a/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD index 3a65fb56b..9d21ad451 100644 --- a/nonsystemd/libretools/PKGBUILD +++ b/nonsystemd/libretools/PKGBUILD @@ -1,78 +1,106 @@ -# Maintainer: Luke Shumaker +# Maintainer: Luke Shumaker +# Maintainer: David P. # Contributor: Joshua Ismael Haase Hernández (xihh) # Contributor: fauno # Contributor: Márcio Silva -pkgname=libretools -pkgver=20181004 -pkgrel=6.1 -pkgrel+=.nonsystemd3 +pkgbase=libretools +pkgname=(libretools librelib gitget) pkgdesc="Programs for Parabola development" -arch=('any') url="https://git.parabola.nu/packages/libretools.git/" license=('GPL3' 'GPL2') -backup=(etc/libretools.conf - etc/libretools.d/chroot.conf - etc/libretools.d/libredbdiff.conf - etc/libretools.d/librefetch.conf) -install=libretools.install -conflicts=(devtools libretools-mips64el) -replaces=(libretools-mips64el) -depends=( - "librelib=$pkgver" - "gitget=$pkgver" # `createworkdir` - 'pacman>=6.0.0' 'pacman<6.0.1' - arch-install-scripts # `mkarchroot` uses `pacstrap` - binutils # `libremakepkg` uses `makepkg` uses `strip` - expac # `libredbdiff` - fakeroot # `libremakepkg` uses `makepkg` uses `fakeroot` - make # `librefetch` - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - chroot-nspawn # chroot-nspawn - tokyocabinet # `toru` - #namcap # Namcap is currently dissabled in libremakepkg :-( - subversion # `diff-unfree` - wget # `aur`, optdepend for librelib:`blacklist` -) -optdepends=('qemu-user-static-binfmt: To build ARM packages from x86') + +pkgver=20190907 +source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-nonsystemd.tar.gz{,.sig} + "revert.patch::https://git.parabola.nu/packages/libretools.git/patch/?id=42cca853176c9ff23a5d2896f9b132630f034fb7" + 0002-libremakepkg-pacman_5_2.patch) +sha256sums=('c9bdc6f422234b6b260349e488266500756857bbb65079783aa5e997b6a2d410' + 'SKIP' + '108aa8bbfb1ffe96427540cd8f7788338883b08ad038b2ed426e93ac6c57e91b' + '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') +validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker + '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P. + +pkgrel=1 +pkgrel+=.nonsystemd2 + +arch=('any') makedepends=(ruby-ronn) checkdepends=( bash-bats git - 'pacman>=6.0.0' 'pacman<6.0.1' + 'pacman>=5.1.1-1.parabola5' 'pacman<6.1' expac openssh rsync tokyocabinet ) -source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} - nonsystemd.patch - 0002-libremakepkg-pacman_5_2.patch) -sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b' - 'SKIP' - '511de3404afcb3fe2ed002a94be00bc0b83d6abeb1cf3ab0456bf916c8f1114e' - '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') -validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker prepare() { - cd "$srcdir/$pkgbase-$pkgver" - - # non-systemd patch changes: - # * uses chroot-nspawn instead of systemd-nspawn - # * replaces systemd-machine-id-setup with dbus-uuidgen - patch -p1 -i ../nonsystemd.patch - - # don't apply 0001-libremakepkg-rw-startdir.patch like libre/libretools because - # by using chroot-nspawn we don't have that issue + cd "$srcdir/$pkgbase-$pkgver-nonsystemd" + patch -N -p1 -i $srcdir/revert.patch patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch } build() { - cd "$srcdir/$pkgbase-$pkgver" + cd "$srcdir/$pkgbase-$pkgver-nonsystemd" make } -package() { - cd "$srcdir/$pkgbase-$pkgver" +package_librelib() { + pkgdesc="The shell library portion of libretools" + license=(GPL2) + conflicts=('xbs') + optdepends=( + 'libretools: for libreblacklist/blacklist.sh' + 'wget: for libreblacklist/blacklist.sh' + ) + + cd "$srcdir/$pkgbase-$pkgver-nonsystemd" + make install-librelib DESTDIR="$pkgdir" +} + +package_gitget() { + pkgdesc="A simple to use downloader for git URLs" + license=(GPL2) + depends=("librelib=$pkgver" git) + + provides=("libregit=$pkgver") + conflicts=("libregit") + replaces=("libregit") + + cd "$srcdir/$pkgbase-$pkgver-nonsystemd" + make install-gitget DESTDIR="$pkgdir" +} + +package_libretools() { + backup=(etc/libretools.conf + etc/libretools.d/chroot.conf + etc/libretools.d/libredbdiff.conf + etc/libretools.d/librefetch.conf) + install=libretools.install + conflicts=(devtools libretools-mips64el) + replaces=(libretools-mips64el) + + depends=( + "librelib=$pkgver" + "gitget=$pkgver" # `createworkdir` + 'pacman>=5.1.1-1.parabola5' 'pacman<6.1' + arch-install-scripts # `mkarchroot` uses `pacstrap` + binutils # `libremakepkg` uses `makepkg` uses `strip` + expac # `libredbdiff` + fakeroot # `libremakepkg` uses `makepkg` uses `fakeroot` + make # `librefetch` + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + tokyocabinet # `toru` + #namcap # Namcap is currently dissabled in libremakepkg :-( + subversion # `diff-unfree` + wget # `aur`, optdepend for librelib:`blacklist` + ) + optdepends=( + 'qemu-user-static-binfmt: To build ARM packages from x86' + ) + + cd "$srcdir/$pkgbase-$pkgver-nonsystemd" make install-libretools DESTDIR="$pkgdir" } diff --git a/nonsystemd/opensysusers/PKGBUILD b/nonsystemd/opensysusers/PKGBUILD deleted file mode 100644 index 562adf48a..000000000 --- a/nonsystemd/opensysusers/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer David P. -# Contributor: Omar Vega Ramos -# Contributor: Luke Shumaker -# Maintainer (Artix): Chris Cromer -# Maintainer (Artix): artoo - -pkgbase=opensysusers -pkgname=(opensysusers opensysusers-docs) -pkgver=0.6 -pkgrel=1 -pkgdesc="A standalone utility for handling systemd-style sysusers.d users and groups" -arch=('any') -url="https://gitea.artixlinux.org/artix/opensysusers" -license=('BSD2') -makedepends=('docbook-xsl') -conflicts=('systemd-tools') -source=("${pkgbase}-${pkgver}.tar.gz::https://gitea.artixlinux.org/artix/opensysusers/archive/${pkgver}.tar.gz" - '20-opensysusers.hook' - 'sysusers-hook') -sha256sums=('bd9ea8ea60b269e3db0f0f96cb700bb64306644f9c5dc9a6253a184294f30726' - '8085d3f8e7b2030cef5e0f50622121ea161a2d9d087664f0a11d36f275b24970' - '4222b2496d8bb1ac9c07707e4ef1b334b8b59eb15451ea8ba0fd6e4c93e50c56') - -prepare() { - cd "${pkgbase}" - sed -i 's|$(INITD): $(INITD).in|$(INITD): openrc/$(INITD).in|' Makefile -} - -build() { - cd "${pkgbase}" - make PREFIX=/usr HAVEOPENRC=yes -} - -package_opensysusers() { - depends=('pacman') - replaces=('opensysusers-systemdcompat') - - cd "${pkgbase}" - make PREFIX=/usr DESTDIR="${pkgdir}" install-shared install-default-bin install-openrc - - # pacman hooks - install -Dm755 ${srcdir}/sysusers-hook "$pkgdir"/usr/share/libalpm/scripts/sysusers-hook - install -Dm644 -t "$pkgdir"/usr/share/libalpm/hooks ${srcdir}/*.hook - - ln -snf "/usr/bin/sysusers" "${pkgdir}/usr/bin/systemd-sysusers" - - install -d "${pkgdir}"/etc/runlevels/boot - ln -snf /etc/init.d/opensysusers "${pkgdir}"/etc/runlevels/boot/opensysusers -} - -package_opensysusers-docs() { - pkgdesc="Opensysusers manpages" - depends=('opensysusers') - replaces=(opensysusers-manpages) - - cd "${pkgbase}" - make PREFIX=/usr DESTDIR="${pkgdir}" install-man -} -- cgit v1.2.2