diff options
| -rw-r--r-- | pcr/gentoo-functions/PKGBUILD | 31 | ||||
| -rw-r--r-- | pcr/netifrc/PKGBUILD | 73 | ||||
| -rw-r--r-- | pcr/netifrc/netifrc.install | 9 | ||||
| -rw-r--r-- | pcr/openrc-base/PKGBUILD | 4 | ||||
| -rw-r--r-- | pcr/openrc-security/PKGBUILD | 14 | ||||
| -rw-r--r-- | pcr/openrc/PKGBUILD | 45 |
6 files changed, 102 insertions, 74 deletions
diff --git a/pcr/gentoo-functions/PKGBUILD b/pcr/gentoo-functions/PKGBUILD new file mode 100644 index 000000000..7ae9d92f0 --- /dev/null +++ b/pcr/gentoo-functions/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer (Manjaro): artoo <artoo@manjaro.org> +# Contributor (Manjaro): williamh <williamh@gentoo.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> + +# Gentoo's ebuild file: +# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +pkgname=gentoo-functions +pkgver=0.12 +pkgrel=1 +pkgdesc="Base functions for Gentoo systems" +arch=('i686' 'x86_64' 'armv7h') +url="https://github.com/gentoo/$pkgname" +license=('GPL2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965') + +_makeargs=( + ROOTPREFIX=/usr + ROOTSBINDIR=/usr/bin +) + +build(){ + cd "$srcdir/$pkgname-$pkgver" + make "${_makeargs[@]}" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" "${_makeargs[@]}" install +} diff --git a/pcr/netifrc/PKGBUILD b/pcr/netifrc/PKGBUILD index 032bd7cd2..dedb469eb 100644 --- a/pcr/netifrc/PKGBUILD +++ b/pcr/netifrc/PKGBUILD @@ -1,64 +1,47 @@ # Maintainer (Manjaro): artoo <artoo@manjaro.org> # Contributor (Manjaro): williamh <williamh@gentoo.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> -_url="https://github.com" - -_net_url="${_url}/gentoo/netifrc/archive" -_func_url="${_url}/gentoo/gentoo-functions/archive" - -_func_ver=0.12 - +# Gentoo's ebuild file: +# https://gitweb.gentoo.org/repo/gentoo.git/tree/net-misc/netifrc/netifrc-0.6.1.ebuild pkgname=netifrc -pkgver=0.6.0 -pkgrel=1.parabola1 +pkgver=0.6.1 +pkgrel=1 pkgdesc="Gentoo Network Interface Management Scripts" -arch=('i686' 'x86_64' 'armv7h') -url="http://www.gentoo.org/proj/en/base/openrc/" +arch=('any') +url="https://wiki.gentoo.org/wiki/Netifrc" license=('BSD2') -groups=('openrc-base') -depends=('eudev-openrc') -install=${pkgname}.install +groups=('base-openrc') +depends=('gentoo-functions' 'openrc>=0.15' 'udev-init-scripts') +conflicts=('udev<172' 'udev-init-scripts<27') +makedepends=('git') backup=('etc/conf.d/net') -source=("${pkgname}-${pkgver}.tar.gz::${_net_url}/${pkgver}.tar.gz" - "gentoo-functions-${_func_ver}.tar.gz::${_func_url}/${_func_ver}.tar.gz") -sha256sums=('b360f4e3b5081ab24db40403a4517c2b7b929fe10dffbd9900bc08d7f3ca650e' - '4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965') - -_id=parabola +validpgpkeys=('A28BEDE08F1744E16037514806C4536755758000') # Jason A. Donenfeld <zx2c4@gentoo.org> +source=("git://anongit.gentoo.org/proj/${pkgname}.git?signed#tag=${pkgver}") +sha256sums=('SKIP') -_net_args=(SYSCONFDIR=/etc) -_net_args+=(PREFIX=/usr) -_net_args+=(SBINDIR=/usr/bin) -_net_args+=(LIBEXECDIR=/usr/lib/${pkgname}) - -_func_args+=(ROOTPREFIX=/usr) -_func_args+=(ROOTSBINDIR=/usr/bin) -_func_args+=(ROOTLIBEXECDIR=/usr/lib/$_id) +_makeargs=( + SYSCONFDIR=/etc + PREFIX=/usr + SBINDIR=/usr/bin + LIBEXECDIR="/usr/lib/${pkgname}" +) build(){ - # make netifrc - cd "${srcdir}/${pkgname}-${pkgver}" - make "${_net_args[@]}" - cd ${srcdir}/gentoo-functions-${_func_ver} - make "${_func_args[@]}" + cd "$srcdir/$pkgname" + make "${_makeargs[@]}" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname" - make DESTDIR="${pkgdir}" "${_net_args[@]}" install + make DESTDIR="$pkgdir" "${_makeargs[@]}" install - install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/doc/net.example" "${pkgdir}/etc/conf.d/net" - - install -d "${pkgdir}/etc/runlevels/boot" - ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo" - - cd ${srcdir}/gentoo-functions-${_func_ver} - make DESTDIR="${pkgdir}" "${_func_args[@]}" install + install -Dm0644 doc/net.example "$pkgdir/etc/conf.d/net" - sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \ - -i "${pkgdir}/usr/lib/${pkgname}/sh/functions.sh" + install -d "$pkgdir/etc/runlevels/boot" + ln -sT "/etc/init.d/net.lo" "$pkgdir/etc/runlevels/boot/net.lo" - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/pcr/netifrc/netifrc.install b/pcr/netifrc/netifrc.install deleted file mode 100644 index fa8554bc3..000000000 --- a/pcr/netifrc/netifrc.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo " ==> Set up your network interface before you reboot if using netifrc." - local _url="https://wiki.gentoo.org/wiki/Handbook:X86/Full/Networking" - echo " ==> Visit ${_url}" -} - -post_upgrade() { - post_install "$1" -} diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD index a62f16cef..5cdf5c3cf 100644 --- a/pcr/openrc-base/PKGBUILD +++ b/pcr/openrc-base/PKGBUILD @@ -24,12 +24,12 @@ pkgname=('cronie-openrc' 'quota-tools-openrc' 'rpcbind-openrc' 'syslog-ng-openrc') -pkgrel=2 +pkgrel=3 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/artix-linux" license=('GPL2') -groups=('base-openrc' 'openrc-base') +groups=('base-openrc') conflicts=('systemd-sysvcompat') source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd" "dmcrypt.confd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd" diff --git a/pcr/openrc-security/PKGBUILD b/pcr/openrc-security/PKGBUILD index 990de0ad4..ba9d56dc7 100644 --- a/pcr/openrc-security/PKGBUILD +++ b/pcr/openrc-security/PKGBUILD @@ -1,21 +1,23 @@ # Maintainer: David P. <megver83@parabola.nu> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" +pkgver=20171101 +_commit=34dfafc5204a4c15ccb7f36d3de2567f4b3aac29 +_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}" _sed_args=(-e 's|/var/run|/run|g') prefix=true $_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') -pkgbase=openrc-base +pkgbase=openrc-security pkgname=('apparmor-openrc' 'iptables-openrc' 'shorewall-openrc' 'shorewall6-openrc' 'firewalld-openrc') -pkgver=20171101 -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" @@ -43,10 +45,6 @@ sha512sums=('bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d3 'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b' '9cf87d5b5807b224a325c9d038f159e55d277ad3eca62a1fd82d06d9ec1d0f71e58b239c57532b9b081271c7ab6f90b281cea1dca0bb9ea26e1e1c8ddaf3a691') -pkgver() { - date +%Y%m%d -} - _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD index 4597d663d..79c606289 100644 --- a/pcr/openrc/PKGBUILD +++ b/pcr/openrc/PKGBUILD @@ -11,9 +11,9 @@ # Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=openrc -pkgname=('openrc' 'openrc-init' 'openrc-sysvinit') +pkgname=('openrc' 'openrc-init' 'openrc-sysvinit' 'openrc-net') pkgver=0.38.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'armv7h') url="https://github.com/OpenRC/" license=('BSD2') @@ -31,11 +31,21 @@ _makeargs=( PREFIX=/usr SBINDIR=/usr/bin LIBEXECDIR=/usr/lib/rc - MKSELINUX=no + + # Because OpenRC documentation is terrible, run this: + # $ grep -rhoE --exclude='*.md' 'MK[^=}? ]+' | sort -u + # If we agree with the default, list it here, but commented out + #MKAUDIT=no + MKBASHCOMP=yes + #MKNET=yes MKPAM=pam - MKTERMCAP=ncurses - MKNET=no + #MKPKGCONFIG=yes + #MKPREFIX=no + #MKSELINUX=no + MKSTATICLIBS=no MKSYSVINIT=yes + MKTERMCAP=ncurses + MKZSHCOMP=yes ) build(){ @@ -62,14 +72,19 @@ build(){ install -d -- "$srcdir/dest/openrc-init/${file%/*}" mv -T -- "$srcdir"/dest/{openrc,openrc-init}/"$file" done + + for file in etc/{init,conf}.d/{network,staticroute}; do + install -d -- "$srcdir/dest/openrc-net/${file%/*}" + mv -T -- "$srcdir"/dest/{openrc,openrc-net}/"$file" + done } package_openrc() { pkgdesc="A dependency based init system" groups=('base-openrc') depends=('psmisc' 'pam' 'openrc-pid1') - optdepends=('netifrc: Network Interface Management Scripts' - 'networkmanager-openrc: NetworkManager') + optdepends=('openrc-net: OpenRC ("newnet") network management scripts' + 'netifrc: Gentoo ("oldnet") network management scripts') backup=('etc/conf.d/agetty' 'etc/conf.d/bootmisc' 'etc/conf.d/consolefont' @@ -91,15 +106,13 @@ package_openrc() { 'etc/pam.d/start-stop-daemon' 'etc/pam.d/supervise-daemon' 'etc/rc.conf') - + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" # Configuration sed -e 's/#unicode="NO"/unicode="YES"/' \ -e 's/#rc_logger="NO"/rc_logger="YES"/' \ -i "$pkgdir/etc/rc.conf" - sed -e 's|#baud=""|baud="38400"|' \ - -i "$pkgdir"/etc/conf.d/agetty install -Dm644 "$srcdir/${pkgbase}.logrotate" "$pkgdir/etc/logrotate.d/${pkgbase}" # License @@ -142,3 +155,15 @@ package_openrc-init() { # License install -Dm644 "$srcdir/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +package_openrc-net() { + pkgdesc="OpenRC new-style networking" + depends=('openrc') + backup=('etc/conf.d/network' + 'etc/conf.d/staticroute') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" + + # License + install -Dm644 "$srcdir/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} |