[bug#51739] [PATCH 1/3] gnu: Add realmd.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[phodina via Guix-patches via]

* gnu/packages/admin.scm (realmd): New variable.
* gnu/packages/patches/realmd-remove-distro-detection.patch: New file.
* gnu/local.mk: Add patch.

diff --git a/gnu/local.mk b/gnu/local.mk
index 05258ac054..611fe40c28 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1736,6 +1736,7 @@ dist_patch_DATA =					\
   %D%/packages/patches/rtags-separate-rct.patch			\
   %D%/packages/patches/racket-minimal-backport-1629887.patch    \
   %D%/packages/patches/racket-minimal-sh-via-rktio.patch	\
+  %D%/packages/patches/realmd-remove-distro-detection.patch \
   %D%/packages/patches/remake-impure-dirs.patch			\
   %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch	\
   %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch	\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d24b068bd7..ef29fd5c98 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -128,6 +128,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages polkit)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
@@ -1533,6 +1534,45 @@ (define-public clusterssh
 over ssh connections.")
     (license license:gpl2+)))

+(define-public realmd
+  (package
+    (name "realmd")
+    (version "0.17.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/freedesktop/realmd")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1c6q2a86kk2f1akzc36nh52hfwsmmc0mbp6ayyjxj4zsyk9zx5bf"))
+              (patches (search-patches "realmd-remove-distro-detection.patch"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib-bin" ,glib "bin")
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)))
+    (inputs
+     `(("glib" ,glib)
+       ("mit-krb5" ,mit-krb5)
+       ("openldap" ,openldap)
+       ("polkit" ,polkit)))
+    (arguments
+     `(#:configure-flags '("--with-systemd-unit-dir=no"
+                           "--with-systemd-journal=no"
+                           "--disable-doc")))
+    (synopsis
+     "DBus service for configuring kerberos and other online identities")
+    (description
+     "Dbus system service that manages discovery and enrollment in
+realms/domains like Active Directory or IPA.")
+    (home-page "https://www.freedesktop.org/software/realmd/")
+    (license license:lgpl2.1)))
+
 (define-public rename
   (package
     (name "rename")
diff --git a/gnu/packages/patches/realmd-remove-distro-detection.patch b/gnu/packages/patches/realmd-remove-distro-detection.patch
new file mode 100644
index 0000000000..ad39e25fe1
--- /dev/null
+++ b/gnu/packages/patches/realmd-remove-distro-detection.patch
@@ -0,0 +1,77 @@
+From 6e69d6784caa1fdeba1ba4b7ed3dc58fcd631275 Mon Sep 17 00:00:00 2001
+From: Petr Hodina <phodina@protonmail.com>
+Date: Sat, 2 Oct 2021 20:08:52 +0200
+Subject: [PATCH] Remove distro detection
+
+
+diff --git a/configure.ac b/configure.ac
+index ee067d9..12a1214 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,33 +24,6 @@ AC_CONFIG_SRCDIR([service/realm-daemon.c])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_MAINTAINER_MODE([enable])
+
+-# -----------------------------------------------------------------------------
+-# Distro Detection
+-
+-AC_ARG_WITH([distro],
+-            [AS_HELP_STRING([--with-distro],
+-                            [Configure for a specific distribution (eg: redhat)]
+-                           )],
+-            [DISTRO=$withval],
+-            [DISTRO=])
+-
+-if test -z $DISTRO; then
+-	AC_CHECK_FILE(/etc/redhat-release, [DISTRO="redhat"])
+-	AC_CHECK_FILE(/etc/debian_version, [DISTRO="debian"])
+-	AC_CHECK_FILE(/etc/SuSE-release, [DISTRO="suse"])
+-
+-	# Not customized for these yet
+-	dnl AC_CHECK_FILE(/etc/gentoo-release, [DISTRO="gentoo"])
+-	dnl AC_CHECK_FILE(/etc/slackware-version, [DISTRO="slackware"])
+-
+-fi
+-
+-if test -z $DISTRO; then
+-	AC_MSG_ERROR([Couldn't detect the distro to configure for. Specify one with --with-distro])
+-fi
+-
+-AC_SUBST(DISTRO)
+-
+ # -----------------------------------------------------------------------------
+ # Basic tools
+
+diff --git a/doc/internals/Makefile.am b/doc/internals/Makefile.am
+index 2acbfd8..4eba507 100644
+--- a/doc/internals/Makefile.am
++++ b/doc/internals/Makefile.am
+@@ -28,10 +28,8 @@ CLEANFILES += \
+
+ internals/realmd-internals.html: $(INTERNAL_DOCBOOK) $(INTERNAL_INCLUDES) $(INTERNAL_STATIC)
+ 	$(AM_V_GEN) mkdir -p internals && cp $(srcdir)/doc/internals/static/* internals/ && \
+-	$(XMLTO) html-nochunks -m $(srcdir)/$(INTERNAL_PARAMS) -o internals \
+-		--searchpath $(abs_builddir):$(abs_srcdir) $(srcdir)/$(INTERNAL_DOCBOOK)
++	#$(XMLTO) html-nochunks -m $(srcdir)/$(INTERNAL_PARAMS) -o internals \
++	#	--searchpath $(abs_builddir):$(abs_srcdir) $(srcdir)/$(INTERNAL_DOCBOOK)
+
+ render-images:
+-	for i in $(SVG_IMAGES:.svg=); do \
+-		inkscape --export-png=static/$$i.png $$i.svg; \
+-	done
++	true
+diff --git a/service/Makefile.am b/service/Makefile.am
+index c17bf3b..0988bf6 100644
+--- a/service/Makefile.am
++++ b/service/Makefile.am
+@@ -137,7 +137,6 @@ install-service:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(privatedir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(localstatedir)/lib/realmd
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(cachedir)
+-	$(INSTALL_DATA) $(srcdir)/service/realmd-$(DISTRO).conf $(DESTDIR)$(privatedir)/realmd-distro.conf
+ uninstall-service:
+ 	rm -f $(DESTDIR)$(privatedir)/realmd-distro.conf
+
+--
+2.32.0
+
--
2.33.1

[bug#51739] [PATCH 2/3] gnu: Use license: prefix.

[phodina via Guix-patches via]

* gnu/packages/time.scm (time, python-pytimeparse, python-pytzdata,
  python2-tzdata, python-pytz, python2-pytz, python-pendulum, python-dateutil,
  python2-dateutil, python-parsedatetime, python2-parsedatetime,
  python-ciso8601, python-tzlocal, python-isodate, python2-isodate,
  python-iso8601, python2-iso8601, python-monotonic, python2-monotonic,
  python-pyrfc3339, python2-pyrfc3339, python-arrow, python-aniso8601,
  python2-aniso8601, datefudge, countdown) [license]: Prefix with license:.

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index b60fab5db5..ce0f644194 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -50,7 +50,7 @@ (define-module (gnu packages time)
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))

 (define-public time
@@ -72,7 +72,7 @@ (define-public time
      "Time is a command that displays information about the resources that a
 program uses.  The display output of the program can be customized or saved
 to a file.")
-    (license gpl3+)))
+    (license license:gpl3+)))

 (define-public python-pytimeparse
   (package
@@ -92,7 +92,7 @@ (define-public python-pytimeparse
     (synopsis "Time expression parser")
     (description "This small Python module parses various kinds of time
 expressions.")
-    (license expat)))
+    (license license:expat)))

 (define-public python-pytzdata
   (package
@@ -115,7 +115,7 @@ (define-public python-pytzdata
     (synopsis "Timezone database for Python")
     (description
      "This library provides a timezone database for Python.")
-    (license expat)))
+    (license license:expat)))

 (define-public python2-tzdata
   (package-with-python2 python-pytzdata))
@@ -139,7 +139,7 @@ (define-public python-pytz
 allows accurate and cross platform timezone calculations using Python 2.4 or
 higher.  It also solves the issue of ambiguous times at the end of daylight
 saving time.  Almost all of the Olson timezones are supported.")
-    (license expat)))
+    (license license:expat)))

 (define-public python2-pytz
   (package-with-python2 python-pytz))
@@ -167,7 +167,7 @@ (define-public python-pendulum
 @{datetime} class, providing an alternative API.  As it inherits from the
 standard @code{datetime} all @code{datetime} instances can be replaced by
 Pendulum instances.")
-    (license expat)))
+    (license license:expat)))

 (define-public python-dateutil
   (package
@@ -208,7 +208,7 @@ (define-public python-dateutil
     ;; The license was changed from the three-clause BSD license to a dual
     ;; Apache 2.0/BSD-3 variant at 2017-12-01.  Some code is only available as
     ;; BSD-3 still; but all new code is dual licensed (the user can choose).
-    (license (list bsd-3 asl2.0))))
+    (license (list license:bsd-3 license:asl2.0))))

 (define-public python2-dateutil
   (package-with-python2 python-dateutil))
@@ -236,7 +236,7 @@ (define-public python-parsedatetime
     (synopsis "Parse human-readable date/time text")
     (description
      "Parse human-readable date/time text.")
-    (license asl2.0)))
+    (license license:asl2.0)))

 (define-public python2-parsedatetime
   (package-with-python2 python-parsedatetime))
@@ -267,7 +267,7 @@ (define-public python-ciso8601
     (description
      "The package ciso8601 converts ISO 8601 or RFC 3339 date time strings into
 Python datetime objects.")
-    (license expat)))
+    (license license:expat)))

 (define-public python-tzlocal
   (package
@@ -305,7 +305,7 @@ (define-public python-tzlocal
 This module attempts to fix a glaring hole in pytz, that there is no way to
 get the local timezone information, unless you know the zoneinfo name, and
 under several distributions that's hard or impossible to figure out.")
-    (license expat)))
+    (license license:expat)))

 (define-public python-isodate
   (package
@@ -326,7 +326,7 @@ (define-public python-isodate
     (description
      "Python-isodate is a python module for parsing and formatting
 ISO 8601 dates, time and duration.")
-    (license bsd-3)))
+    (license license:bsd-3)))

 (define-public python2-isodate
   (package-with-python2 python-isodate))
@@ -355,7 +355,7 @@ (define-public python-iso8601
     (description
      "This module parses the most common forms of ISO 8601 date strings (e.g.
 @code{2007-01-14T20:34:22+00:00}) into @code{datetime} objects.")
-    (license expat)))
+    (license license:expat)))

 (define-public python2-iso8601
   (package-with-python2 python-iso8601))
@@ -378,7 +378,7 @@ (define-public python-monotonic
     (description
      "This module provides a @code{monotonic()} function which returns the
 value (in fractional seconds) of a clock which never goes backwards.")
-    (license asl2.0)))
+    (license license:asl2.0)))

 (define-public python2-monotonic
   (package-with-python2 python-monotonic))
@@ -403,7 +403,7 @@ (define-public python-pyrfc3339
     (synopsis "Python timestamp library")
     (description "Python library for generating and parsing RFC 3339-compliant
 timestamps.")
-    (license expat)))
+    (license license:expat)))

 (define-public python2-pyrfc3339
   (package-with-python2 python-pyrfc3339))
@@ -445,7 +445,7 @@ (define-public python-arrow
      "Arrow is a Python library to creating, manipulating, formatting and
 converting dates, times, and timestamps.  It implements and updates the
 datetime type.")
-    (license asl2.0)))
+    (license license:asl2.0)))

 (define-public python-aniso8601
   (package
@@ -510,7 +510,7 @@ (define-public datefudge
      "Utility that fakes the system time by pre-loading a small library that
 modifies the @code{time}, @code{gettimeofday} and @code{clock_gettime} system
 calls.")
-    (license gpl2)))
+    (license license:gpl2)))

 (define-public countdown
   (package
@@ -537,4 +537,4 @@ (define-public countdown
      "Countdown provides a fancy text display while it counts down to zero
 from a starting point you provide.  The user can pause and resume the
 countdown from the text user interface.")
-    (license expat)))
+    (license license:expat)))
--
2.33.1

[bug#51739] [PATCH 3/3] gnu: Add rdate.

[phodina via Guix-patches via]

* gnu/packages/time.scm (rdate): New variable.

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index ce0f644194..581a40f5d3 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -36,6 +36,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages time)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang)
@@ -465,11 +466,35 @@ (define-public python-aniso8601
     (synopsis "Python library for parsing ISO 8601 strings")
     (description
      "This package contains a library for parsing ISO 8601 datetime strings.")
-    (license bsd-3)))
+    (license license:bsd-3)))

 (define-public python2-aniso8601
   (package-with-python2 python-aniso8601))

+(define-public rdate
+  (let ((commit "91d84610e3695e90a884e2953908e95a856a9b74")
+        (revision "1"))
+    (package
+      (name "rdate")
+      (version commit)
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/njh/rdate")
+                      (commit version)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "002ryjq8gj1ml5la4v6dr3bh1zw5kxwy65rpziq8d2ccccarhv59"))))
+      (build-system gnu-build-system)
+      (native-inputs `(("autoconf" ,autoconf)
+                       ("automake" ,automake)))
+      (synopsis "Get date and time based on RFC 868")
+      (description "@code{rdate} connects to an RFC 868 time server over a TCP/IP
+network, printing the returned time and/or setting the system clock.")
+      (home-page "https://www.aelius.com/njh/rdate/")
+      (license license:gpl2))))
+
 (define-public datefudge
   (package
     (name "datefudge")
--
2.33.1

[bug#51739] [PATCH 2/3] gnu: Use license: prefix.

[Leo Famulari]

On Wed, Nov 10, 2021 at 03:07:46AM +0000, phodina via Guix-patches via wrote:
> * gnu/packages/time.scm (time, python-pytimeparse, python-pytzdata,
>   python2-tzdata, python-pytz, python2-pytz, python-pendulum, python-dateutil,
>   python2-dateutil, python-parsedatetime, python2-parsedatetime,
>   python-ciso8601, python-tzlocal, python-isodate, python2-isodate,
>   python-iso8601, python2-iso8601, python-monotonic, python2-monotonic,
>   python-pyrfc3339, python2-pyrfc3339, python-arrow, python-aniso8601,
>   python2-aniso8601, datefudge, countdown) [license]: Prefix with license:.

Is there a reason to make this change? Usually we only prefix the
license field when necessary.

[bug#51739] [PATCH 3/3] gnu: Add rdate.

[Leo Famulari]

On Wed, Nov 10, 2021 at 03:08:17AM +0000, phodina via Guix-patches via wrote:
> * gnu/packages/time.scm (rdate): New variable.

Thanks for the patch!

> +(define-public rdate
> +  (let ((commit "91d84610e3695e90a884e2953908e95a856a9b74")
> +        (revision "1"))
> +    (package
> +      (name "rdate")
> +      (version commit)

As described in the manual section Version Numbers [0], we should use the
git-version procedure to create the package's version. As the most
recent Git tag before the specified commit is 1.4, it would be like
this:

(version (git-version "1.4" revision commit))

> +      (synopsis "Get date and time based on RFC 868")
> +      (description "@code{rdate} connects to an RFC 868 time server over a TCP/IP
> +network, printing the returned time and/or setting the system clock.")
> +      (home-page "https://www.aelius.com/njh/rdate/")
> +      (license license:gpl2))))

The license header of 'src/rdate.c' says "version 2 of the License, or
(at your option) any later version.", so the license is gpl2+.

Can you send a revised patch?

[0] https://guix.gnu.org/manual/en/html_node/Version-Numbers.html

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[Leo Famulari]

On Wed, Nov 10, 2021 at 03:04:19AM +0000, phodina via Guix-patches via wrote:
> * gnu/packages/admin.scm (realmd): New variable.
> * gnu/packages/patches/realmd-remove-distro-detection.patch: New file.
> * gnu/local.mk: Add patch.

Thanks!

> +    (license license:lgpl2.1)))

I think it is lgpl2.1+, based on the license headers.

> diff --git a/gnu/packages/patches/realmd-remove-distro-detection.patch b/gnu/packages/patches/realmd-remove-distro-detection.patch
> new file mode 100644
> index 0000000000..ad39e25fe1
> --- /dev/null
> +++ b/gnu/packages/patches/realmd-remove-distro-detection.patch
> @@ -0,0 +1,77 @@
> +From 6e69d6784caa1fdeba1ba4b7ed3dc58fcd631275 Mon Sep 17 00:00:00 2001
> +From: Petr Hodina <phodina@protonmail.com>
> +Date: Sat, 2 Oct 2021 20:08:52 +0200
> +Subject: [PATCH] Remove distro detection

Can you add a comment to the patch explaining its purpose?

> +-	AC_MSG_ERROR([Couldn't detect the distro to configure for. Specify one with --with-distro])

Do we need to pass "--with-distro=guix" or something?

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[Ludovic Courtès]

Hi,

phodina <phodina@protonmail.com> skribis:

> * gnu/packages/admin.scm (realmd): New variable.
> * gnu/packages/patches/realmd-remove-distro-detection.patch: New file.
> * gnu/local.mk: Add patch.

[...]

> +    (synopsis
> +     "DBus service for configuring kerberos and other online identities")
> +    (description
> +     "Dbus system service that manages discovery and enrollment in
> +realms/domains like Active Directory or IPA.")

Could you improve on it as per
<https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html>?

> +    (home-page "https://www.freedesktop.org/software/realmd/")
> +    (license license:lgpl2.1)))

Isn’t it ‘lgpl2.1+’?  This is the case unless the authors explicitly
omitted the “or any later version” wording.

> +-AC_ARG_WITH([distro],
> +-            [AS_HELP_STRING([--with-distro],
> +-                            [Configure for a specific distribution (eg: redhat)]
> +-                           )],
> +-            [DISTRO=$withval],
> +-            [DISTRO=])
> +-
> +-if test -z $DISTRO; then
> +-	AC_CHECK_FILE(/etc/redhat-release, [DISTRO="redhat"])
> +-	AC_CHECK_FILE(/etc/debian_version, [DISTRO="debian"])
> +-	AC_CHECK_FILE(/etc/SuSE-release, [DISTRO="suse"])
> +-
> +-	# Not customized for these yet
> +-	dnl AC_CHECK_FILE(/etc/gentoo-release, [DISTRO="gentoo"])
> +-	dnl AC_CHECK_FILE(/etc/slackware-version, [DISTRO="slackware"])
> +-
> +-fi
> +-
> +-if test -z $DISTRO; then
> +-	AC_MSG_ERROR([Couldn't detect the distro to configure for. Specify one with --with-distro])
> +-fi

Rather than adding this patch, I think you can do:

  #:configure-flags '("--with-distro=GNU Guix")

Could you send an updated patch?

Thanks,
Ludo’.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[Ludovic Courtès]

Oops I had overlooked this review.  At least we made the same
suggestions.  :-)

Ludo’.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[phodina via Guix-patches via]

Hi Ludo',

here's the updated patch.

You're assumption about --with-distro was right. The patch can be omitted by simple substitution and config argument.

The license is indeed lgpl2.1+.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[phodina via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 130 bytes --]

Sorry I've lost signal and when connected again the mail client sent the reply without the patch.

Now it's attached properly.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v2-0001-gnu-Add-realmd.patch --]
[-- Type: text/x-patch; name=v2-0001-gnu-Add-realmd.patch, Size: 2792 bytes --]

From a488638672d7a4360743c2ba52474801a3fcdbc8 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 10 Nov 2021 03:53:37 +0100
Subject: [PATCH v2] gnu: Add realmd.

* gnu/packages/admin.scm (realmd): New variable.

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d24b068bd7..5e25a283e8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -128,6 +128,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages polkit)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
@@ -1533,6 +1534,55 @@ (define-public clusterssh
 over ssh connections.")
     (license license:gpl2+)))
 
+(define-public realmd
+  (package
+    (name "realmd")
+    (version "0.17.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/freedesktop/realmd")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1c6q2a86kk2f1akzc36nh52hfwsmmc0mbp6ayyjxj4zsyk9zx5bf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-systemd-unit-dir=no"
+                           "--with-systemd-journal=no"
+                           "--with-distro=GNU guix"
+                           "--disable-doc")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'fix-service
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Don't copy config file
+             (substitute* "Makefile"
+               ((".*/service/realmd-.*") "")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib-bin" ,glib "bin")
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)))
+    (inputs
+     `(("glib" ,glib)
+       ("mit-krb5" ,mit-krb5)
+       ("openldap" ,openldap)
+       ("polkit" ,polkit)))
+    (synopsis "DBus service for network authentication")
+    (description "This package provides an on demand system DBus service.
+It allows callers to configure network authentication and domain membership
+in a standard way.  Realmd discovers information about the domain or realm
+automatically and does not require complicated configuration in order to join
+a domain or realm.  Dbus system service that manages discovery and enrollment in
+realms/domains like Active Directory or IPA.")
+    (home-page "https://www.freedesktop.org/software/realmd/")
+    (license license:lgpl2.1+)))
+
 (define-public rename
   (package
     (name "rename")
-- 
2.33.1

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[Leo Famulari]

On Thu, Dec 02, 2021 at 07:13:40PM +0000, phodina via Guix-patches via wrote:
> Subject: [PATCH v2] gnu: Add realmd.
> 
> * gnu/packages/admin.scm (realmd): New variable.

Thanks for fixing the issues I had mentioned.

> +         (add-before 'install 'fix-service
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Don't copy config file
> +             (substitute* "Makefile"
> +               ((".*/service/realmd-.*") "")))))))

Can you clarify what this does? It wasn't in earlier revisions of the
patch.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[phodina via Guix-patches via]

Hi Leo,

thanks for the comments.

>> +         (add-before 'install 'fix-service> +           >(lambda* (#:key outputs #:allow-other-keys)> +             ;; >Don't copy config file> +             (substitute* "Makefile"> +               >((".*/service/realmd-.*") "")))))))
>Can you clarify what this does? It wasn't in earlier revisions >of thepatch.

So the whole reason why there was the patch attached is that realmd is querying the distro to use later specific config for the service. As suggested this can be overcome by using --with-distro.

However, it still tries to install the configuration file located in the sources under service/realmd-*.

There are files for debian, redhat and suse. Plus there is one labeled as default.

Since it also needs other packages such as samba, winbind, sssd, adcli and kfb5 the idea was to leave the configuration file up to a realmd service. Though that one is not yet implemented.

I'll probably refactor the comment as it's not that descriptive.

Petr

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[Leo Famulari]

On Thu, Dec 02, 2021 at 09:50:02PM +0000, phodina via Guix-patches via wrote:
> I'll probably refactor the comment as it's not that descriptive.

Thanks, with that change the patch will be ready to push.

[bug#51739] [PATCH 1/3] gnu: Add realmd.

[phodina via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 51 bytes --]

Hi Leo,

here's an updated comment.

----
Petr

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v3-0001-gnu-Add-realmd.patch --]
[-- Type: text/x-patch; name=v3-0001-gnu-Add-realmd.patch, Size: 2881 bytes --]

From c630ef52f780d22e7defbea308e805f0a513858b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 10 Nov 2021 03:53:37 +0100
Subject: [PATCH v3] gnu: Add realmd.

* gnu/packages/admin.scm (realmd): New variable.

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d24b068bd7..b32f7e29f6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -128,6 +128,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages polkit)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
@@ -1533,6 +1534,56 @@ (define-public clusterssh
 over ssh connections.")
     (license license:gpl2+)))
 
+(define-public realmd
+  (package
+    (name "realmd")
+    (version "0.17.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/freedesktop/realmd")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1c6q2a86kk2f1akzc36nh52hfwsmmc0mbp6ayyjxj4zsyk9zx5bf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-systemd-unit-dir=no"
+                           "--with-systemd-journal=no"
+                           "--with-distro=GNU guix"
+                           "--disable-doc")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'fix-service
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; GNU Guix does not have service config file, therefore we empty
+             ;; the line where we copy the file
+             (substitute* "Makefile"
+               ((".*/service/realmd-.*") "")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib-bin" ,glib "bin")
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)))
+    (inputs
+     `(("glib" ,glib)
+       ("mit-krb5" ,mit-krb5)
+       ("openldap" ,openldap)
+       ("polkit" ,polkit)))
+    (synopsis "DBus service for network authentication")
+    (description "This package provides an on demand system DBus service.
+It allows callers to configure network authentication and domain membership
+in a standard way.  Realmd discovers information about the domain or realm
+automatically and does not require complicated configuration in order to join
+a domain or realm.  Dbus system service that manages discovery and enrollment in
+realms/domains like Active Directory or IPA.")
+    (home-page "https://www.freedesktop.org/software/realmd/")
+    (license license:lgpl2.1+)))
+
 (define-public rename
   (package
     (name "rename")
-- 
2.33.1

bug#51739: [PATCH 1/3] gnu: Add realmd.

[Leo Famulari]

On Fri, Dec 03, 2021 at 02:17:49PM +0000, phodina via Guix-patches via wrote:
> Hi Leo,
> 
> here's an updated comment.

Thank you! I tweaked the comment to make it more idiomatic, added you to
the list of authors of gnu/packages/admin.scm, and pushed as
0ba4e94e8448e6c27cceb690b085c8d8cf66e577.