From 3cc41bec2527975284ae8f8db511ec4aa4b5cc4a Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 29 Aug 2024 02:51:43 +0300 Subject: [PATCH] rebuild eudev pam failed pam-git upg pciutils wireless-regdb --- eudev/PKGBUILD | 8 +- eudev/initcpio_install | 14 +- libpipeline/PKGBUILD | 10 +- libpipeline/PKGBUILD-arch | 6 +- ...5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch | 27 +++ pam-git/NOTE | 1 + pam-git/PKGBUILD | 102 +++++++++ pam-git/PKGBUILD-arch | 63 ++++++ pam-git/PKGBUILD-arch.new | 58 +++++ ...6362087414e52524d3d9d9b3faa21e1db620.patch | 73 ++++++ pam-git/clean | 1 + pam-git/configure | 211 ++++++++++++++++++ pam-git/deps | 12 + pam-git/key | 1 + pam-git/pam.tmpfiles | 1 + pam-git/time | 3 + pam/PKGBUILD | 6 +- pciutils/PKGBUILD | 16 +- pciutils/PKGBUILD-arch | 19 +- wireless-regdb/PKGBUILD | 22 +- wireless-regdb/PKGBUILD-arch | 15 +- wireless-regdb/clean | 2 +- wireless-regdb/deps | 2 +- 23 files changed, 619 insertions(+), 54 deletions(-) create mode 100644 pam-git/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch create mode 100644 pam-git/NOTE create mode 100644 pam-git/PKGBUILD create mode 100644 pam-git/PKGBUILD-arch create mode 100644 pam-git/PKGBUILD-arch.new create mode 100644 pam-git/b7b96362087414e52524d3d9d9b3faa21e1db620.patch create mode 100644 pam-git/clean create mode 100644 pam-git/configure create mode 100644 pam-git/deps create mode 100644 pam-git/key create mode 100644 pam-git/pam.tmpfiles create mode 100644 pam-git/time diff --git a/eudev/PKGBUILD b/eudev/PKGBUILD index 54ca442..db265da 100644 --- a/eudev/PKGBUILD +++ b/eudev/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=eudev pkgname=(eudev libeudev) pkgver=3.2.14 -pkgrel=02 +pkgrel=03 _udev_ver=251 pkgdesc="The userspace dev tools (udev) - patched as udev-251" # This is the old official gentoo fork source location @@ -113,9 +113,9 @@ validpgpkeys=('BA60BC20F37E59444D6D25001365720913D2F22D') # Boian Bonev (GnuPG sha256sums=(8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f # eudev-3.2.14.tar.gz 515f81eb968c7580fdea3023dee5e1e136aeb77fbef4e8a86ad76b933b1cf722 # eudev-3.2.14.tar.gz.asc 692cc489cc65216892099a40fa55ab22f52f169f2f264727dce83ff39f8ef3bd # initcpio_hooks - 9df5ef77223f129c046bce8f4b078f8cec5f3fb03dc6b443f3330e7ba1fd50ec # initcpio_install + 65424f841d5802d00507a5a82fc51b5b8e8d24a1576c605947efd653ee6fc34a # initcpio_install 846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151) # udev-hwdb.hook -## dcf7572b872fc2a97e8c1ffcfb4fb4c0ed76205100792de0eb57d2368e4ed1df eudev-3.2.14-02-x86_64.pkg.tar.lz -## d23590d52df4eed42d6a22a78ee225df84725bcff9bcb811d868265cfa531606 libeudev-3.2.14-02-x86_64.pkg.tar.lz +## 2e30d15737adfd5ce07ce5d6e0a1930b9616f7a53bc82bebd5f7caa0813781e9 eudev-3.2.14-03-x86_64.pkg.tar.lz +## c9d40aa80f3f03d9a7ccba3e2c2f6a658224bef6ba7bc11c421b20f42f00105d libeudev-3.2.14-03-x86_64.pkg.tar.lz diff --git a/eudev/initcpio_install b/eudev/initcpio_install index dca7037..196cac7 100755 --- a/eudev/initcpio_install +++ b/eudev/initcpio_install @@ -1,4 +1,4 @@ -#!/usd/bin/bash +#!/bin/bash build() { add_file "/etc/udev/udev.conf" @@ -17,9 +17,11 @@ build() { } help() { - cat <" -sha256sums=(b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0 # libpipeline-1.5.7.tar.gz - b027d496667a3055a37d8d98542f1731d55c823fa742d596d5d0c6239bc36c34) # libpipeline-1.5.7.tar.gz.asc +sha256sums=(1b1203ca152ccd63983c3f2112f7fe6fa5afd453218ede5153d1b31e11bb8405 # libpipeline-1.5.8.tar.gz + a201417b3e370feccda30a9395f5e7d1ea8d9793419f5cce339f47ddb1c626e4) # libpipeline-1.5.8.tar.gz.asc -## cc36c5ee75fd0e146d6ad52dbf2a07256f88f1826c4de5cfbf5167022f046f6a libpipeline-1.5.7-02-x86_64.pkg.tar.lz +## e1cdefeea8963eb6432f98ba8b401a912f179747e35e09da115a5dda7abeca1e libpipeline-1.5.8-01-x86_64.pkg.tar.lz diff --git a/libpipeline/PKGBUILD-arch b/libpipeline/PKGBUILD-arch index 786b029..0331dd3 100644 --- a/libpipeline/PKGBUILD-arch +++ b/libpipeline/PKGBUILD-arch @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke pkgname=libpipeline -pkgver=1.5.7 -pkgrel=2 +pkgver=1.5.8 +pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('x86_64') url="https://nongnu.org/libpipeline/" @@ -10,7 +10,7 @@ license=('GPL-3.0-or-later') depends=('glibc') # https://gitlab.com/cjwatson/libpipeline source=(https://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.asc}) -sha256sums=('b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0' +sha256sums=('1b1203ca152ccd63983c3f2112f7fe6fa5afd453218ede5153d1b31e11bb8405' 'SKIP') #validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson #validpgpkeys=('87317259431038049C92C139F6DD330210FA4CD1') # "Colin Watson " diff --git a/pam-git/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch b/pam-git/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch new file mode 100644 index 0000000..7df83bf --- /dev/null +++ b/pam-git/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch @@ -0,0 +1,27 @@ +From 470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Fri, 19 Jan 2024 10:09:00 +0100 +Subject: [PATCH] pam_unix: do not warn if password aging is disabled + +Later checks will print a warning if daysleft is 0. If password +aging is disabled, leave daysleft at -1. + +Resolves: https://github.com/linux-pam/linux-pam/issues/743 +Fixes: 9ebc14085a3b ("pam_unix: allow disabled password aging") +Signed-off-by: Tobias Stoeckmann +--- + modules/pam_unix/passverify.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c +index 5c4f862e7..1bc98fa25 100644 +--- a/modules/pam_unix/passverify.c ++++ b/modules/pam_unix/passverify.c +@@ -314,7 +314,6 @@ PAMH_ARG_DECL(int check_shadow_expiry, + } + if (spent->sp_lstchg < 0) { + D(("password aging disabled")); +- *daysleft = 0; + return PAM_SUCCESS; + } + if (curdays < spent->sp_lstchg) { diff --git a/pam-git/NOTE b/pam-git/NOTE new file mode 100644 index 0000000..4812313 --- /dev/null +++ b/pam-git/NOTE @@ -0,0 +1 @@ +needs more work to build this way, somehow it keeps running to errors and I can_t figure out why, when it builds so easy out of the tarball diff --git a/pam-git/PKGBUILD b/pam-git/PKGBUILD new file mode 100644 index 0000000..97ad117 --- /dev/null +++ b/pam-git/PKGBUILD @@ -0,0 +1,102 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://git.disroot.org/joborun-pkg/jobcore/src/branch/main/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=pam +pkgver=1.6.1 +pkgrel=03 +pkgdesc="PAM (Pluggable Authentication Modules) library - w/o systemd" +url="http://linux-pam.org" +# Arch all of a sudden is enforcing 'libnsl' as a dependency for pam when it was not needed +# It creates problems for us so we choose to stay without it +# +makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') +#makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl' 'git' 'libxslt' 'docbook5-xml' 'fop') +provides=('libpam.so' 'libpamc.so' 'libpam_misc.so') +backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment) +#source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver{,-docs}.tar.xz{,.asc} +source=(pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v${pkgver} + $pkgname.tmpfiles) +options=('!emptydirs') + +prepare() { + cd $pkgname + ./autogen.sh + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done +} + +build() { + cd $pkgname +# prevent the installation of an unneeded systemd file: +# sed -e /service_DATA/d \ +# -i modules/pam_namespace/Makefile.am && +# this is the same as proposed by LFS as removing it +# at the end with the post_-install statement at the +# end of the PKGBUILD +# also disabling systemd options here in ./config +# seems also acceptable + + ./configure \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --disable-db \ + --disable-logind \ + --with-systemdunitdir=no \ + --disable-systemd + make +} + +package() { + depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so') # + install -Dm 644 $pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf + cd $pkgname + make DESTDIR="$pkgdir" SCONFIGDIR=/etc/security install + + # set unix_chkpwd uid + chmod +s "$pkgdir"/usr/bin/unix_chkpwd + + # remove doc which is not used anymore + # FS #40749 +# rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html + +# This is no longer required as it only builds with logind disabled, no +# allowance for consolekit to substitute +# rm $pkgdir/usr/lib/systemd/system/pam_namespace.service + +} + +post_install() { + # Fix unix_chkpwd perms. + chmod 4755 ${DESTDIR}/usr/bin/unix_chkpwd +} + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) + +license=('GPL-2.0-only') + +validpgpkeys=(8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB # Thorsten Kukuk + 296D6F29A020808E8717A8842DB5BD89A340AEB7) #Dimitry V. Levin + +b2sums=('12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3' + '36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f') + +sha256sums=(56903537535a5188e420ef5f2d879456cf11cd845aec77beccebc2abefc92be6 # pam 1.6.1 +# f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e # Linux-PAM-1.6.1.tar.xz +# ef0e0597974d988c9f25f5a155e001b9dcb972618a4a166b8acefac1f5357303 # Linux-PAM-1.6.1.tar.xz.asc +# fd7b13b9993c94677e78e84d12387b8da104b5ba668eda3f17360abe4277e79c # Linux-PAM-1.6.1-docs.tar.xz +# 23235acc1d48b3cc9ba22467ed38e78b47f6c4a17f8297bd94f5cdd7fd8c8e51 # Linux-PAM-1.6.1-docs.tar.xz.asc + 5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac) # pam.tmpfiles + diff --git a/pam-git/PKGBUILD-arch b/pam-git/PKGBUILD-arch new file mode 100644 index 0000000..9bc4f09 --- /dev/null +++ b/pam-git/PKGBUILD-arch @@ -0,0 +1,63 @@ +# Maintainer: Tobias Powalowski +# Maintainer: Levente Polyak +# Contributor: judd + +pkgname=pam +pkgver=1.6.1 +pkgrel=2 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('x86_64') +license=('GPL-2.0-only') +url="http://linux-pam.org" +depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so' 'libnsl') +makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') +provides=('libpam.so' 'libpamc.so' 'libpam_misc.so') +backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment) +source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver{,-docs}.tar.xz{,.asc} + $pkgname.tmpfiles) +validpgpkeys=( + '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk + '296D6F29A020808E8717A8842DB5BD89A340AEB7' #Dimitry V. Levin +) + +sha256sums=('f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e' + 'SKIP' + 'fd7b13b9993c94677e78e84d12387b8da104b5ba668eda3f17360abe4277e79c' + 'SKIP' + '5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac') + +options=('!emptydirs') + +prepare() { + cd Linux-PAM-$pkgver + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done +} + +build() { + cd Linux-PAM-$pkgver + ./configure \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --enable-logind \ + --disable-db + make +} + +package() { + install -Dm 644 $pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf + cd Linux-PAM-$pkgver + make DESTDIR="$pkgdir" SCONFIGDIR=/etc/security install + + # set unix_chkpwd uid + chmod +s "$pkgdir"/usr/bin/unix_chkpwd +} + +# vim: ts=2 sw=2 et: diff --git a/pam-git/PKGBUILD-arch.new b/pam-git/PKGBUILD-arch.new new file mode 100644 index 0000000..5ca76c4 --- /dev/null +++ b/pam-git/PKGBUILD-arch.new @@ -0,0 +1,58 @@ +# Maintainer: Tobias Powalowski +# Maintainer: Levente Polyak +# Contributor: judd + +pkgname=pam +pkgver=1.6.1 +pkgrel=3 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('x86_64') +license=('GPL-2.0-only') +url="http://linux-pam.org" +depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so' 'libnsl' 'systemd-libs') +makedepends=('git' 'flex' 'w3m' 'libxslt' 'docbook-xml' 'docbook5-xml' 'docbook-xsl' 'fop') +provides=('libpam.so' 'libpamc.so' 'libpam_misc.so') +backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment) +source=("pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v${pkgver}" + "${pkgname}.tmpfiles") +validpgpkeys=( + '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk + '296D6F29A020808E8717A8842DB5BD89A340AEB7' # Dimitry V. Levin +) +b2sums=('12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3' + '36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f') +options=('!emptydirs') + +prepare() { + cd "${pkgname}" + ./autogen.sh + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch ${src}..." + patch -Np1 < "../${src}" + done +} + +build() { + cd "${pkgname}" + ./configure \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --enable-logind \ + --disable-db + make +} + +package() { + install -Dm 644 $pkgname.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf + cd "${pkgname}" + make DESTDIR="${pkgdir}" SCONFIGDIR=/etc/security install + + # set unix_chkpwd uid + chmod +s "${pkgdir}"/usr/bin/unix_chkpwd +} + diff --git a/pam-git/b7b96362087414e52524d3d9d9b3faa21e1db620.patch b/pam-git/b7b96362087414e52524d3d9d9b3faa21e1db620.patch new file mode 100644 index 0000000..75bc954 --- /dev/null +++ b/pam-git/b7b96362087414e52524d3d9d9b3faa21e1db620.patch @@ -0,0 +1,73 @@ +From b7b96362087414e52524d3d9d9b3faa21e1db620 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Wed, 24 Jan 2024 18:57:42 +0100 +Subject: [PATCH] pam_unix: try to set uid to 0 for unix_chkpwd + +The geteuid check does not cover all cases. If a program runs with +elevated capabilities like CAP_SETUID then we can still check +credentials of other users. + +Keep logging for future analysis though. + +Resolves: https://github.com/linux-pam/linux-pam/issues/747 +Fixes: b3020da7da38 ("pam_unix/passverify: always run the helper to obtain shadow password file entries") + +Signed-off-by: Tobias Stoeckmann +--- + modules/pam_unix/pam_unix_acct.c | 17 +++++++++-------- + modules/pam_unix/support.c | 14 +++++++------- + 2 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c +index 8f5ed3e0d..7ffcb9e3f 100644 +--- a/modules/pam_unix/pam_unix_acct.c ++++ b/modules/pam_unix/pam_unix_acct.c +@@ -110,14 +110,15 @@ int _unix_run_verify_binary(pam_handle_t *pamh, unsigned long long ctrl, + _exit(PAM_AUTHINFO_UNAVAIL); + } + +- if (geteuid() == 0) { +- /* must set the real uid to 0 so the helper will not error +- out if pam is called from setuid binary (su, sudo...) */ +- if (setuid(0) == -1) { +- pam_syslog(pamh, LOG_ERR, "setuid failed: %m"); +- printf("-1\n"); +- fflush(stdout); +- _exit(PAM_AUTHINFO_UNAVAIL); ++ /* must set the real uid to 0 so the helper will not error ++ out if pam is called from setuid binary (su, sudo...) */ ++ if (setuid(0) == -1) { ++ uid_t euid = geteuid(); ++ pam_syslog(pamh, euid == 0 ? LOG_ERR : LOG_DEBUG, "setuid failed: %m"); ++ if (euid == 0) { ++ printf("-1\n"); ++ fflush(stdout); ++ _exit(PAM_AUTHINFO_UNAVAIL); + } + } + +diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c +index d391973f9..69811048e 100644 +--- a/modules/pam_unix/support.c ++++ b/modules/pam_unix/support.c +@@ -562,13 +562,13 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, + _exit(PAM_AUTHINFO_UNAVAIL); + } + +- if (geteuid() == 0) { +- /* must set the real uid to 0 so the helper will not error +- out if pam is called from setuid binary (su, sudo...) */ +- if (setuid(0) == -1) { +- D(("setuid failed")); +- _exit(PAM_AUTHINFO_UNAVAIL); +- } ++ /* must set the real uid to 0 so the helper will not error ++ out if pam is called from setuid binary (su, sudo...) */ ++ if (setuid(0) == -1) { ++ D(("setuid failed")); ++ if (geteuid() == 0) { ++ _exit(PAM_AUTHINFO_UNAVAIL); ++ } + } + + /* exec binary helper */ diff --git a/pam-git/clean b/pam-git/clean new file mode 100644 index 0000000..1caf8a2 --- /dev/null +++ b/pam-git/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,*xz*,pam} diff --git a/pam-git/configure b/pam-git/configure new file mode 100644 index 0000000..8fc530c --- /dev/null +++ b/pam-git/configure @@ -0,0 +1,211 @@ +`configure' configures Linux-PAM 1.6.0 to adapt to many kinds of systems. + +Usage: src/Linux-PAM-1.6.0/configure [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print `checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for `--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or `..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, `make install' will install all the files in +`/usr/bin', `/usr/lib' etc. You can specify +an installation prefix other than `/usr' using `--prefix', +for instance `--prefix=$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/Linux-PAM] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files + --enable-Werror turn on -Werror compiler option + --disable-pie disable position-independent executables (PIE) + --disable-doc Do not generate or install documentation + --disable-examples Do not build the examples + --disable-prelude do not use prelude + --enable-debug specify you are building with debugging on + --enable-docbook-rng=FILE + RNG file for checking XML files + [default=http://docbook.org/xml/5.0/rng/docbookxi.rng] + --enable-html-stylesheet=FILE + html stylesheet path + [default=http://docbook.sourceforge.net/release/xsl-ns/current/html/chunk.xsl] + --enable-txt-stylesheet=FILE + text stylesheet path + [default=http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl] + --enable-pdf-stylesheet=FILE + pdf stylesheet path + [default=http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl] + --enable-man-stylesheet=FILE + man stylesheet path + [default=http://docbook.sourceforge.net/release/xsl-ns/current/manpages/profile-docbook.xsl] + --enable-securedir=DIR path to location of PAMs [default=$libdir/security] + --enable-isadir=DIR path to arch-specific module files + [default=../../(basename of $libdir)/security] + --enable-sconfigdir=DIR path to module conf files + [default=$sysconfdir/security] + --enable-pamlocking configure libpam to observe a global authentication + lock + --enable-read-both-confs + read both /etc/pam.d and /etc/pam.conf files + --disable-lckpwdf do not use the lckpwdf function + --disable-audit do not enable audit support + --enable-db=(db|gdbm|ndbm|yes|no) + Default behavior 'yes', which is to check for libdb + first, followed by gdbm and ndbm. Use 'no' to + disable db support. + --disable-nis Disable building NIS/YP support in pam_unix + --enable-usergroups sets the usergroups option default to enabled + --disable-selinux do not use SELinux + --disable-logind Disable logind support + --disable-econf do not use libeconf + --enable-vendordir=DIR Directory for distribution provided configuration + files + --enable-openssl use OpenSSL crypto libraries + --disable-regenerate-docu + Don't re-build documentation from XML sources + --disable-nls do not use Native Language Support + --disable-rpath do not hardcode runtime library paths + --disable-unix do not build pam_unix module + --enable-lastlog do build pam_lastlog module + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + --with-libprelude-prefix=PFX + Prefix where libprelude is installed (optional) + --with-mailspool path to mail spool directory + default _PATH_MAILDIR if defined in paths.h, otherwise /var/spool/mail + --with-xauth additional path to check for xauth when it is called from pam_xauth + added to the default of /usr/X11R6/bin/xauth, /usr/bin/xauth, /usr/bin/X11/xauth + --with-randomdev=(|yes|no) + use specified random device instead of /dev/urandom + or 'no' to disable + --with-db-uniquename=extension + Unique name for db libraries and functions. + --with-xml-catalog=CATALOG + path to xml catalog to use + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir + --with-uidmin= default value for regular user min uid (1000) + --with-kernel-overflow-uid= + kernel overflow uid, default (uint16_t)-2=65534 + --with-systemdunitdir=DIR + path to systemd service directory + --with-misc-conv-bufsize= + Size of input buffer for libpam_misc's misc_conv() + conversation function, default=4096 + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + YACC The `Yet Another Compiler Compiler' implementation to use. + Defaults to the first program found out of: `bison -y', `byacc', + `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a + default value of `-d' given by some make applications. + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + CRYPT_CFLAGS + C compiler flags for CRYPT, overriding pkg-config + CRYPT_LIBS linker flags for CRYPT, overriding pkg-config + TIRPC_CFLAGS + C compiler flags for TIRPC, overriding pkg-config + TIRPC_LIBS linker flags for TIRPC, overriding pkg-config + NSL_CFLAGS C compiler flags for NSL, overriding pkg-config + NSL_LIBS linker flags for NSL, overriding pkg-config + SYSTEMD_CFLAGS + C compiler flags for SYSTEMD, overriding pkg-config + SYSTEMD_LIBS + linker flags for SYSTEMD, overriding pkg-config + ECONF_CFLAGS + C compiler flags for ECONF, overriding pkg-config + ECONF_LIBS linker flags for ECONF, overriding pkg-config + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to the package provider. diff --git a/pam-git/deps b/pam-git/deps new file mode 100644 index 0000000..0439e11 --- /dev/null +++ b/pam-git/deps @@ -0,0 +1,12 @@ +git +w3m +docbook-xml +docbook-xsl +docbook5-xml +fop + + +autoconf +automake +gettext +bison diff --git a/pam-git/key b/pam-git/key new file mode 100644 index 0000000..e8134cc --- /dev/null +++ b/pam-git/key @@ -0,0 +1 @@ +gpg -v --recv-key A8041FA839E16E36 diff --git a/pam-git/pam.tmpfiles b/pam-git/pam.tmpfiles new file mode 100644 index 0000000..f6e490b --- /dev/null +++ b/pam-git/pam.tmpfiles @@ -0,0 +1 @@ +d /run/faillock 0755 root root - diff --git a/pam-git/time b/pam-git/time new file mode 100644 index 0000000..bfcf04e --- /dev/null +++ b/pam-git/time @@ -0,0 +1,3 @@ +real 0m45.534s +user 1m1.412s +sys 0m6.432s diff --git a/pam/PKGBUILD b/pam/PKGBUILD index 7aa2186..d1e0c75 100644 --- a/pam/PKGBUILD +++ b/pam/PKGBUILD @@ -7,10 +7,9 @@ pkgname=pam pkgver=1.6.1 -pkgrel=02 +pkgrel=03 pkgdesc="PAM (Pluggable Authentication Modules) library - w/o systemd" url="http://linux-pam.org" -depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so') # # Arch all of a sudden is enforcing 'libnsl' as a dependency for pam when it was not needed # It creates problems for us so we choose to stay without it # @@ -58,6 +57,7 @@ build() { package() { install -Dm 644 $pkgname.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf cd Linux-PAM-$pkgver + depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so') # make DESTDIR="$pkgdir" SCONFIGDIR=/etc/security install # set unix_chkpwd uid @@ -93,4 +93,4 @@ sha256sums=(f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e # 23235acc1d48b3cc9ba22467ed38e78b47f6c4a17f8297bd94f5cdd7fd8c8e51 # Linux-PAM-1.6.1-docs.tar.xz.asc 5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac) # pam.tmpfiles -## 78c5a00980f5da0258d338f2514b43084d4223f7c6fd5e75e1ef19d630cacaf1 pam-1.6.1-02-x86_64.pkg.tar.lz +## 99e7bccdaf2412c504ef0424a95b29c26650c2b050096c0107f2f01b3bae2737 pam-1.6.1-03-x86_64.pkg.tar.lz diff --git a/pciutils/PKGBUILD b/pciutils/PKGBUILD index 0423e9e..e849bc2 100644 --- a/pciutils/PKGBUILD +++ b/pciutils/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pciutils pkgver=3.13.0 -pkgrel=01 +pkgrel=02 pkgdesc="PCI bus configuration space access library and tools" url="https://mj.ucw.cz/sw/pciutils/" url2="https://www.kernel.org/pub/software/utils/pciutils/" @@ -15,7 +15,7 @@ depends=('glibc' 'hwdata' 'kmod') makedepends=('git') optdepends=('which: for update-pciids' 'grep: for update-pciids' - 'curl: for update-pciids') + 'curl: for update-pciids') #source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2) # https://mirrors.edge.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.{xz,sign}) # https://mirrors.edge.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.xz) @@ -25,15 +25,18 @@ source=(git+https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git#tag=v$pkg build() { cd $pkgname - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a + make OPT="${CFLAGS}" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata \ + MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata \ + MANDIR=/usr/share/man all } package() { cd $pkgname - make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata \ + MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib rm -rf "$pkgdir"/usr/share/hwdata } @@ -46,7 +49,8 @@ license=('GPL-2.0-only') validpgpkeys=(C466A56CADA981F4297D20C31F3D0761D9B65F0B # Martin Mares 5558F9399CD7836850553C6EC28E7847ED70F82D) # Martin Mares +b2sums=('51f41d1ec60eeea51f8534a0dd27f9b0aed4230dbea871d1161273019ee305c1f3536c81c295d13ff40edafe86ae76b0eec9a808f0fd2f90e3f5a7dd34e80ea7') sha256sums=(a198253ac31ee593aeaa4e84c4393f7ad9b1e513ebc6f85c42802dc4c744691d) # pciutils -## 5c69d1ecbb9b1cd29ab7a641b756b2718a87d06e1f2eca94e585a2ce8eaddc00 pciutils-3.13.0-01-x86_64.pkg.tar.lz +## daa609d89e38c655391cd67ffe8e9591a896988d8b08b947eb4d3d5526b07f82 pciutils-3.13.0-02-x86_64.pkg.tar.lz diff --git a/pciutils/PKGBUILD-arch b/pciutils/PKGBUILD-arch index 9d0e0f0..1ac4393 100644 --- a/pciutils/PKGBUILD-arch +++ b/pciutils/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Tobias Powalowski pkgname=pciutils pkgver=3.13.0 -pkgrel=1 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" arch=(x86_64) license=('GPL-2.0-only') @@ -10,25 +10,24 @@ depends=('glibc' 'hwdata' 'kmod') makedepends=('git') optdepends=('which: for update-pciids' 'grep: for update-pciids' - 'curl: for update-pciids') -source=( - git+https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git#tag=v$pkgver?signed - ) + 'curl: for update-pciids') +source=("git+https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git#tag=v$pkgver?signed") validpgpkeys=( 'C466A56CADA981F4297D20C31F3D0761D9B65F0B' # Martin Mares ) -sha256sums=('a198253ac31ee593aeaa4e84c4393f7ad9b1e513ebc6f85c42802dc4c744691d') +b2sums=('51f41d1ec60eeea51f8534a0dd27f9b0aed4230dbea871d1161273019ee305c1f3536c81c295d13ff40edafe86ae76b0eec9a808f0fd2f90e3f5a7dd34e80ea7') build() { - cd $pkgname - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a + cd "${pkgname}" + make OPT="${CFLAGS}" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } package() { - cd $pkgname + cd "${pkgname}" make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib - rm -rf "$pkgdir"/usr/share/hwdata + rm -rf "${pkgdir}"/usr/share/hwdata } + diff --git a/wireless-regdb/PKGBUILD b/wireless-regdb/PKGBUILD index 3d90f8c..3f18b71 100644 --- a/wireless-regdb/PKGBUILD +++ b/wireless-regdb/PKGBUILD @@ -7,25 +7,27 @@ pkgname=wireless-regdb pkgver=2024.07.04 -pkgrel=01 +pkgrel=02 pkgdesc="Central Regulatory Domain Database" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" replaces=(crda) provides=(crda) conflicts=(crda) backup=(etc/conf.d/wireless-regdom) -depends=(bash iw) -source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign} +makedepends=(git) +#source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign} +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git?signed#tag=master-${pkgver//./-}" wireless-regdom set-wireless-regdom 85-regulatory.rules) package() { + depends=(bash iw) install -Dm644 wireless-regdom -t "${pkgdir}"/etc/conf.d install -Dm644 85-regulatory.rules -t "${pkgdir}"/usr/lib/udev/rules.d install -Dm755 set-wireless-regdom -t "${pkgdir}"/usr/bin - cd ${pkgname}-${pkgver} + cd ${pkgname} make install DESTDIR="${pkgdir}" MANDIR=usr/share/man FIRMWARE_PATH=usr/lib/firmware for dom in $(grep ^country db.txt | cut -d' ' -f2 | sed 's|:||g'); do @@ -34,7 +36,7 @@ package() { sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom rm "${pkgdir}"/etc/conf.d/wireless-regdom.tmp - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 "${srcdir}"/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } #---- arch license gpg-key & sha256sums ---- @@ -45,11 +47,15 @@ license=('LicenseRef-custom') validpgpkeys=('B3F2469D78D78BD09D366F37C94035C21B4F2AEB') #Chen-Yu Tsai -sha256sums=(9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb # wireless-regdb-2024.07.04.tar.xz - 6c94592525dc6c9e4308e6faeb37280f0f90c0185f592b4e4e795338af701c32 # wireless-regdb-2024.07.04.tar.sign +b2sums=('ac2ad6a327cd619d3d08cb099cbb6b8f0ec00f9f02f98ea39321ba232a6eae0a17d129c58c508cdc6d10bd7d279d2cd7b737ae340c25725211c956f847e2db20' + '4d470f76ba0ac3c9c25425cd2ce5c9cb93292e565ab3038e975aa837abaad83325f1340cef8ca73150a07f8e77cd542a485e35daef8c403d48c93814f1ccacea' + '0d245faf594f9051a9941fd5e1b6c02fd0668cf4241ca8bdaa2b2e56a805d5d013db59191b0899745f842974fe978ad4add1cad21c7f5a71bc58968c5d1c4be2' + '50ff5e8d21db396f57b29677e65970f35433399a2268b22099a48d9dc45817734b544699e1efc6b0e4f4fa95e191e101b25226b4df02f6b7fa75f5036c94d2c0') + +sha256sums=(e64fdb5d4dbbbab3eee45898aee79363e4e9b96bb47f8968e63ee4e5c1dab82a # wireless-regdb 2024.07.04 192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b # wireless-regdom 603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3 # set-wireless-regdom f5055dfe7584757a11b419836320bcdcd1d3d1e5caf26e20c63a0c64779f3376) # 85-regulatory.rules -## cffe04a5f1a89600dc3fa39b34bef8fd854d892a2fe7aae2f6f3dc903f893fcd wireless-regdb-2024.07.04-01-x86_64.pkg.tar.lz +## d76c37af0b867232405a0981118d88f5aadb05998f0d3478c6897ccd82ae7253 wireless-regdb-2024.07.04-02-x86_64.pkg.tar.lz diff --git a/wireless-regdb/PKGBUILD-arch b/wireless-regdb/PKGBUILD-arch index 65a5c7f..1a247c9 100644 --- a/wireless-regdb/PKGBUILD-arch +++ b/wireless-regdb/PKGBUILD-arch @@ -1,23 +1,24 @@ -# Maintainer: Thomas Bächler +# Maintainer: Tobias Powalowski +# Contributor: Thomas Bächler pkgname=wireless-regdb pkgver=2024.07.04 -pkgrel=1 +pkgrel=2 pkgdesc="Central Regulatory Domain Database" arch=('any') url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" license=('LicenseRef-custom') depends=('bash' 'iw') +makedepends=('git') replaces=('crda') provides=('crda') conflicts=('crda') backup=(etc/conf.d/wireless-regdom) -source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign} +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git?signed#tag=master-${pkgver//./-}" wireless-regdom set-wireless-regdom 85-regulatory.rules) -b2sums=('ee9c35dd5eb337fa6139db5a7d4c416a0526e8daa378d08ff48f4bb19cae902a393b4c83dc879206a5ff4570aaacbc421aeb5b8ef7683e811926d46916b1623b' - 'SKIP' +b2sums=('ac2ad6a327cd619d3d08cb099cbb6b8f0ec00f9f02f98ea39321ba232a6eae0a17d129c58c508cdc6d10bd7d279d2cd7b737ae340c25725211c956f847e2db20' '4d470f76ba0ac3c9c25425cd2ce5c9cb93292e565ab3038e975aa837abaad83325f1340cef8ca73150a07f8e77cd542a485e35daef8c403d48c93814f1ccacea' '0d245faf594f9051a9941fd5e1b6c02fd0668cf4241ca8bdaa2b2e56a805d5d013db59191b0899745f842974fe978ad4add1cad21c7f5a71bc58968c5d1c4be2' '50ff5e8d21db396f57b29677e65970f35433399a2268b22099a48d9dc45817734b544699e1efc6b0e4f4fa95e191e101b25226b4df02f6b7fa75f5036c94d2c0') @@ -28,7 +29,7 @@ package() { install -Dm644 85-regulatory.rules -t "${pkgdir}"/usr/lib/udev/rules.d install -Dm755 set-wireless-regdom -t "${pkgdir}"/usr/bin - cd ${pkgname}-${pkgver} + cd "${pkgname}" make install DESTDIR="${pkgdir}" MANDIR=usr/share/man FIRMWARE_PATH=usr/lib/firmware for dom in $(grep ^country db.txt | cut -d' ' -f2 | sed 's|:||g'); do @@ -37,5 +38,5 @@ package() { sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom rm "${pkgdir}"/etc/conf.d/wireless-regdom.tmp - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/wireless-regdb/clean b/wireless-regdb/clean index 24e7b3c..293b0b5 100644 --- a/wireless-regdb/clean +++ b/wireless-regdb/clean @@ -1 +1 @@ -rm -rf {src,pkg,wireles*tar.{xz,sign}} +rm -rf {src,pkg,wireles*tar.{xz,sign},$(pbde)} diff --git a/wireless-regdb/deps b/wireless-regdb/deps index 22f87cb..f4099d9 100644 --- a/wireless-regdb/deps +++ b/wireless-regdb/deps @@ -1,3 +1,3 @@ -iw +git