~ruther/guix-local

5594f4c999a71427d7aad9898d7e614b8dbd6b3a — Timotej Lazar 3 years ago 9c51330
gnu: sssd: Update to 2.9.1.

* gnu/packages/sssd.scm (sssd): Update to 2.9.1.
[native-inputs]: Add bc.
* gnu/packages/patches/sssd-system-directories.patch: Adjust for new version.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2 files changed, 9 insertions(+), 16 deletions(-)

M gnu/packages/patches/sssd-system-directories.patch
M gnu/packages/sssd.scm
M gnu/packages/patches/sssd-system-directories.patch => gnu/packages/patches/sssd-system-directories.patch +5 -14
@@ 2,19 2,10 @@ Do not attempt to create $localstatedir and $sysconfdir (i.e., /var and /etc)
upon "make install".

diff --git a/Makefile.am b/Makefile.am
index 0de53a2c8..51ad57bf1 100644
index e780e8a14..afd2b0a49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ sssddatadir = $(datadir)/sssd
 sssdapiplugindir = $(sssddatadir)/sssd.api.d
 sssdtapscriptdir = $(sssddatadir)/systemtap
 krb5snippetsdir = $(sssddatadir)/krb5-snippets
-dbuspolicydir = $(sysconfdir)/dbus-1/system.d
+dbuspolicydir = $(prefix)/etc/dbus-1/system.d
 dbusservicedir = $(datadir)/dbus-1/system-services
 sss_statedir = $(localstatedir)/lib/sss
 runstatedir = @runstatedir@
@@ -85,7 +85,7 @@ pkgconfigdir = $(libdir)/pkgconfig
@@ -84,7 +84,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 krb5rcachedir = @krb5rcachedir@
 sudolibdir = @sudolibpath@
 polkitdir = @polkitdir@


@@ 23,7 14,7 @@ index 0de53a2c8..51ad57bf1 100644
 systemtap_tapdir = @tapset_dir@
 sssdkcmdatadir = $(datadir)/sssd-kcm
 deskprofilepath = $(sss_statedir)/deskprofile
@@ -5195,7 +5195,6 @@ installsssddirs::
@@ -5378,7 +5378,6 @@ installsssddirs::
     $(DESTDIR)$(bindir) \
     $(DESTDIR)$(sbindir) \
     $(DESTDIR)$(mandir) \


@@ 31,7 22,7 @@ index 0de53a2c8..51ad57bf1 100644
     $(DESTDIR)$(pluginpath) \
     $(DESTDIR)$(libdir)/ldb \
     $(DESTDIR)$(dbuspolicydir) \
@@ -5205,24 +5204,12 @@ installsssddirs::
@@ -5388,24 +5387,12 @@ installsssddirs::
     $(DESTDIR)$(sssddatadir) \
     $(DESTDIR)$(sudolibdir) \
     $(DESTDIR)$(autofslibdir) \


@@ 56,7 47,7 @@ index 0de53a2c8..51ad57bf1 100644
 
 if HAVE_DOXYGEN
 docs:
@@ -5338,7 +5325,6 @@ if BUILD_SAMBA
@@ -5523,7 +5510,6 @@ if BUILD_SAMBA
 endif
 if BUILD_KCM
 	$(MKDIR_P) $(DESTDIR)/$(sssdkcmdatadir)

M gnu/packages/sssd.scm => gnu/packages/sssd.scm +4 -2
@@ 34,6 34,7 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages)
  #:use-module (gnu packages adns)
  #:use-module (gnu packages algebra)
  #:use-module (gnu packages augeas)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages bash)


@@ 138,7 139,7 @@ fundamental object types for C.")
(define-public sssd
  (package
    (name "sssd")
    (version "2.8.1")
    (version "2.9.1")
    (source
     (origin
       (method git-fetch)


@@ 147,7 148,7 @@ fundamental object types for C.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
        (base32 "19vn2a1r33q6fnw7jmfv3s4kirnviz0rgq0w6wzx6h008iysidsd"))
        (base32 "159hpd49nq3256j46lanbycx8hrj517s1pvxrflxsdqcdyix59rr"))
       (patches (search-patches "sssd-system-directories.patch"))))
    (build-system gnu-build-system)
    (arguments


@@ 279,6 280,7 @@ fundamental object types for C.")
    (native-inputs
     (list autoconf
           automake
           bc ; for tests
           check ; for tests
           cmocka ; for tests
           docbook-xml