ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #313668 from crayor1/master

Browse Source 
autofs: 5.1.6 -> 5.1.9
This commit is contained in:
Peder Bergebakken Sundt 2024-06-12 12:59:01 +02:00 committed by GitHub
commit 2279c02ec5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/os-specific/linux/autofs/default.nix
View File

@ -1,28 +1,33 @@
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto , libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto, pkgconf
, fetchpatch , fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.1.6"; version = "5.1.9";
pname = "autofs"; pname = "autofs";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${version}.tar.xz"; url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${version}.tar.xz";
sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx"; sha256 = "sha256-h+avagN5S5Ri6lGXgeUOfSO198ks1Z4RQshdJJOzwks=";
}; };
patches = [ patches = [
# glibc 2.34 compat
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/autofs/raw/cc745af5e42396d540d5b3b92fae486e232bf6bd/f/autofs-5.1.7-use-default-stack-size-for-threads.patch"; url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-update-configure.patch";
sha256 = "sha256-6ETDFbW7EhHR03xFWF+6OJBgn9NX3WW3bGhTNGodaOc="; hash = "sha256-BomhNw+lMHcgs5gQlzapZ6p/Ji3gJUVkrLpZssBmwbg=";
excludes = [ "CHANGELOG" ]; })
(fetchpatch {
url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-ldap_parse_page_control-check.patch";
hash = "sha256-W757LU9r9kuzLeThif2a1olRtxNrJy5suemLS7yfbIU=";
})
(fetchpatch {
url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-crash-in-make_options_string.patch";
hash = "sha256-YjTdJ50iNhJ2UjFdrKYEFNt04z0PfmElbFa4GuSskLA=";
}) })
]; ];
preConfigure = '' preConfigure = ''
configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-libtirpc"
export sssldir="${sssd}/lib/sssd/modules" export sssldir="${sssd}/lib/sssd/modules"
export HAVE_SSS_AUTOFS=1 export HAVE_SSS_AUTOFS=1
@ -37,9 +42,6 @@ stdenv.mkDerivation rec {
unset STRIP # Makefile.rules defines a usable STRIP only without the env var. unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
''; '';
# configure script is not finding the right path
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
installPhase = '' installPhase = ''
make install SUBDIRS="lib daemon modules man" # all but samples make install SUBDIRS="lib daemon modules man" # all but samples
#make install SUBDIRS="samples" # impure! #make install SUBDIRS="samples" # impure!
@ -48,7 +50,7 @@ stdenv.mkDerivation rec {
buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd
openssl cyrus_sasl rpcsvc-proto ]; openssl cyrus_sasl rpcsvc-proto ];
nativeBuildInputs = [ flex bison ]; nativeBuildInputs = [ flex bison pkgconf ];
meta = { meta = {
description = "Kernel-based automounter"; description = "Kernel-based automounter";