From patchwork Wed Nov 10 03:04:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34373 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0B3E027BBE3; Wed, 10 Nov 2021 03:05:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56B8227BBE1 for ; Wed, 10 Nov 2021 03:05:24 +0000 (GMT) Received: from localhost ([::1]:40684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkdvN-0002cW-If for patchwork@mira.cbaines.net; Tue, 09 Nov 2021 22:05:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkdv4-0002bx-AM for guix-patches@gnu.org; Tue, 09 Nov 2021 22:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkdv4-0004tL-1U for guix-patches@gnu.org; Tue, 09 Nov 2021 22:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkdv3-0005Od-Ss for guix-patches@gnu.org; Tue, 09 Nov 2021 22:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51739] [PATCH 1/3] gnu: Add realmd. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Nov 2021 03:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51739 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51739@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.163651348920720 (code B ref -1); Wed, 10 Nov 2021 03:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Nov 2021 03:04:49 +0000 Received: from localhost ([127.0.0.1]:36497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkdun-0005O3-Ka for submit@debbugs.gnu.org; Tue, 09 Nov 2021 22:04:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:42342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkdui-0005Nu-Ji for submit@debbugs.gnu.org; Tue, 09 Nov 2021 22:04:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkdui-0002bA-FW for guix-patches@gnu.org; Tue, 09 Nov 2021 22:04:40 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:32247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkduc-0004q3-L1 for guix-patches@gnu.org; Tue, 09 Nov 2021 22:04:39 -0500 Date: Wed, 10 Nov 2021 03:04:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636513464; bh=khNMxb3tUYLv8RVm9hwcs0Oyj+hym/iHc0K5geeQBbc=; h=Date:To:From:Reply-To:Subject:From; b=OnfaG0hddDL9X/XpR5wY5NqTI7H8gcAU64Vhff4kofOVeAoZXEH9W5wJCcaB/Hyaj dANvw2tsuKeN9QmRYPuGVzVhbjDRmEC/CB1myRwMNeWEpZHg/no8OzujlLBpcUHVGm 1RVdndKVWuWJLHm1I+BONu1ZcohJA4DIc2eDM3vA= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=phodina@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (realmd): New variable. * gnu/packages/patches/realmd-remove-distro-detection.patch: New file. * gnu/local.mk: Add patch. --- 2.33.1 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 +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 +