From 9f85b0878f307141bd5ca57a0e3500409219115c Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 6 Feb 2022 14:45:21 +0000 Subject: made changes to acpid --- repo/meta/all.xibuild | 2 +- repo/meta/system.xibuild | 2 +- repo/meta/util.xibuild | 2 +- repo/system/acpid.xibuild | 29 +++++++++++++++++++++++++++++ repo/system/dhcp.xibuild | 2 +- repo/system/sysklogd.xibuild | 14 ++++++++++++++ repo/util/acpi.xibuild | 22 +++++----------------- repo/util/pciutils.xibuild | 3 ++- repo/util/sudo.xibuild | 1 + 9 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 repo/system/acpid.xibuild diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild index 166d9fb..22bd230 100644 --- a/repo/meta/all.xibuild +++ b/repo/meta/all.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="AlL tHe pacKageS!!" -DEPS=( asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc git help2man llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto linux-headers linux cacert-utils fakechroot fakeroot icecream acl attr binutils bootscripts brotli bzip2 cacerts coreutils dbus efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libidn libldap libndp libnghttp libnl libp11-kit libpipeline libpng libpsl libsasl libseccomp libsigsegv libssh2 libtasn1 libtool libunistring libxcrypt libxml2 libxslt lz4 lzo mkinitramfs mpfr ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl xxhash xz zip zlib zstd bash cpio curl diffutils dosfstools dracut e2fsprogs elfutils file gawk genfstab grep groff inetutils iproute2 keyutils less make-ca man-db neofetch openssh procps-ng rsync unzip util-linux vim which wpa_supplicant sysconfigs xibuild xipkg) +DEPS=( asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc git help2man llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto linux-headers linux cacert-utils fakechroot fakeroot icecream acl acpid attr binutils bootscripts brotli bzip2 cacerts coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libidn libldap libndp libnghttp libnl libp11-kit libpipeline libpng libpsl libsasl libseccomp libsigsegv libssh2 libtasn1 libtool libunistring libusb libxcrypt libxml2 libxslt lz4 lzo mkinitramfs mpfr ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl xxhash xz zip zlib zstd acpi bash cpio curl diffutils dosfstools dracut e2fsprogs elfutils file gawk genfstab grep groff inetutils iproute2 keyutils less lynx make-ca man-db neofetch openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim wget which wpa_supplicant sysconfigs xibuild xipkg) diff --git a/repo/meta/system.xibuild b/repo/meta/system.xibuild index b64532e..c04bb19 100644 --- a/repo/meta/system.xibuild +++ b/repo/meta/system.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="All the the packages available in system" -DEPS=( acl attr binutils bootscripts brotli bzip2 cacerts coreutils dbus efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libidn libldap libndp libnghttp libnl libp11-kit libpipeline libpng libpsl libsasl libseccomp libsigsegv libssh2 libtasn1 libtool libunistring libxcrypt libxml2 libxslt lz4 lzo mkinitramfs mpfr ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl xxhash xz zip zlib zstd) +DEPS=( acl acpid attr binutils bootscripts brotli bzip2 cacerts coreutils dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext glibc glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libidn libldap libndp libnghttp libnl libp11-kit libpipeline libpng libpsl libsasl libseccomp libsigsegv libssh2 libtasn1 libtool libunistring libusb libxcrypt libxml2 libxslt lz4 lzo mkinitramfs mpfr ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl xxhash xz zip zlib zstd) diff --git a/repo/meta/util.xibuild b/repo/meta/util.xibuild index 215a453..c93b601 100644 --- a/repo/meta/util.xibuild +++ b/repo/meta/util.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="All the the packages available in util" -DEPS=( bash cpio curl diffutils dosfstools dracut e2fsprogs elfutils file gawk genfstab grep groff inetutils iproute2 keyutils less make-ca man-db neofetch openssh procps-ng rsync unzip util-linux vim which wpa_supplicant) +DEPS=( acpi bash cpio curl diffutils dosfstools dracut e2fsprogs elfutils file gawk genfstab grep groff inetutils iproute2 keyutils less lynx make-ca man-db neofetch openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim wget which wpa_supplicant) diff --git a/repo/system/acpid.xibuild b/repo/system/acpid.xibuild new file mode 100644 index 0000000..45748a9 --- /dev/null +++ b/repo/system/acpid.xibuild @@ -0,0 +1,29 @@ +#!/bin/bash + +MAKEDEPS=(make) +DEPS=(glibc) + +PKG_VER=2.0.33 +SOURCE=https://downloads.sourceforge.net/acpid2/acpid-$PKG_VER.tar.xz +DESC="Daemon for battery, power, and thermal readings" + +BOOTSCRIPTS=blfs-bootscripts-20210826 +ADDITIONAL=( + https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz + ) + +build () { + ./configure --prefix=/usr \ + --docdir=/usr/share/doc/acpid-$PKG_VER && + make +} + +package () { + make DESTDIR=$PKG_DEST install + install -v -m755 -d $PKG_DEST/etc/acpi/events && + cp -r samples $PKG_DEST/usr/share/doc/acpid-$PKG_VER + + tar xf $BOOTSCRIPTS.tar.xz + cd $BOOTSCRIPTS + make DESTDIR=$PKG_DEST install-acpid +} diff --git a/repo/system/dhcp.xibuild b/repo/system/dhcp.xibuild index 6b57b1d..ddf30dc 100644 --- a/repo/system/dhcp.xibuild +++ b/repo/system/dhcp.xibuild @@ -3,7 +3,7 @@ MAKEDEPS=(bash iproute2 openldap) DEPS=(glibc libldap) -PKG_VER=4.4.2-P1 +PKG_VER=4.4.3b1 SOURCE=https://ftp.isc.org/isc/dhcp/$PKG_VER/dhcp-$PKG_VER.tar.gz BOOTSCRIPTS=blfs-bootscripts-20210826 diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild index 69b389f..a9e5d86 100644 --- a/repo/system/sysklogd.xibuild +++ b/repo/system/sysklogd.xibuild @@ -13,4 +13,18 @@ build () { package () { make DESTDIR=$PKG_DEST install + mkdir -pv $PKG_DEST/etc + cat > $PKG_DEST/etc/syslog.conf << "EOF" +# Begin /etc/syslog.conf + +auth,authpriv.* -/var/log/auth.log +*.*;auth,authpriv.none -/var/log/sys.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log +*.emerg * + +# End /etc/syslog.conf +EOF } diff --git a/repo/util/acpi.xibuild b/repo/util/acpi.xibuild index ff720a4..c09792d 100644 --- a/repo/util/acpi.xibuild +++ b/repo/util/acpi.xibuild @@ -1,29 +1,17 @@ #!/bin/bash MAKEDEPS=(make) -DEPS=(glibc) +DEPS=(glibc acpid) -PKG_VER=2.0.33 -SOURCE=https://downloads.sourceforge.net/acpid2/acpid-$PKG_VER.tar.xz +PKG_VER=1.7 +SOURCE=https://downloads.sourceforge.net/acpiclient/acpi-$PKG_VER.tar.gz DESC="Client for battery, power, and thermal readings" -BOOTSCRIPTS=blfs-bootscripts-20210826 -ADDITIONAL=( - https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz - ) - build () { - ./configure --prefix=/usr \ - --docdir=/usr/share/doc/acpid-$PKG_VER && + ./configure --prefix=/usr make } package () { - make DESTDIR=$PKG_DEST install - install -v -m755 -d $PKG_DEST/etc/acpi/events && - cp -r samples $PKG_DEST/usr/share/doc/acpid-$PKG_VER - - tar xf $BOOTSCRIPTS.tar.xz - cd $BOOTSCRIPTS - make DESTDIR=$PKG_DEST install-acpid + make -C "acpi-$PKG_VER" DESTDIR"=$PKG_DEST" install } diff --git a/repo/util/pciutils.xibuild b/repo/util/pciutils.xibuild index 421dbd9..b10c4e3 100644 --- a/repo/util/pciutils.xibuild +++ b/repo/util/pciutils.xibuild @@ -14,13 +14,14 @@ build () { } package () { - make DESTDIR=$PKG_DEST + make DESTDIR=$PKG_DEST \ PREFIX=/usr \ SHAREDIR=/usr/share/hwdata \ SHARED=yes \ install install-lib && chmod -v 755 $PKG_DEST/usr/lib/libpci.so + mkdir -pv $PKG_DEST/etc/cron.weekly/ cat > $PKG_DEST/etc/cron.weekly/update-pciids.sh << "EOF" && #!/bin/bash /usr/sbin/update-pciids diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild index a613ccb..f1d220f 100644 --- a/repo/util/sudo.xibuild +++ b/repo/util/sudo.xibuild @@ -28,6 +28,7 @@ Defaults secure_path="/usr/sbin:/usr/bin" %wheel ALL=(ALL) ALL EOF + mkdir -pv $PKG_DEST/etc/pam.d cat > $PKG_DEST/etc/pam.d/sudo << "EOF" # Begin /etc/pam.d/sudo -- cgit v1.2.1