[PATCH] move the sudo library outside libdir

[Michal Šrubař]

Hi,

those two patches fixes https://fedorahosted.org/sssd/ticket/1983.
Sudo modul will be now installed into $libdir/sssd/modules and no longer into
$libdir but because specfile has to work everywhere we have to add
--with-sudo-lib-path=$libdir for this time. For next update to F-20 we can add
something like:
if fedora_version >= 20; then
    sudo-lib-path=$libdir/sssd/modules;
else
    sudo-lib-path=$libdir;

From 5e94532fe5b50cdfd16ddb4e7cf5a007e0fcc58c Mon Sep 17 00:00:00 2001
From: Michal Srubar 
Date: Tue, 11 Feb 2014 12:01:28 +0100
Subject: [PATCH] sudo modul is now installed into $libdir/sssd/modules by
  default and no longer into $libdir

https://fedorahosted.org/sssd/ticket/1983
---
  contrib/sssd.spec.in | 1 +
  src/conf_macros.m4   | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 6bc2aa2a41bf100cfadda63ad83850e4b980647f..36627c591dfe28857554182c8aebe64ff672a639 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -417,6 +417,7 @@ autoreconf -ivf
      --with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
      --enable-nsslibdir=/%{_lib} \
      --enable-pammoddir=/%{_lib}/security \
+    --with-sudo-lib-path=/%{_libdir} \
      --disable-static \
      --disable-rpath \
      %{?with_ccache} \
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index 4be819d4a3389dfcf89a0452aab8165c0ec216e4..597e9ec6c9b85880616bb89659bbfc09be556470 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -588,7 +588,7 @@ AC_DEFUN([WITH_SUDO_LIB_PATH],
                                 )
                  ]
                 )
-    sudolibpath="${libdir}"
+    sudolibpath="${libdir}/sssd/modules"
      if test x"$with_sudo_lib_path" != x; then
          sudolibpath=$with_sudo_lib_path
      fi

[Jakub Hrozek]

On Tue, Feb 11, 2014 at 12:15:02PM +0100, Michal Šrubař wrote:
> Hi,
>
> those two patches fixes https://fedorahosted.org/sssd/ticket/1983.
> Sudo modul will be now installed into $libdir/sssd/modules and no longer into
> $libdir but because specfile has to work everywhere we have to add
> --with-sudo-lib-path=$libdir for this time. For next update to F-20 we can add
> something like:
> if fedora_version >= 20; then
>    sudo-lib-path=$libdir/sssd/modules;
> else
>    sudo-lib-path=$libdir;

Hi,

I wanted to bump this thread and ask for review. I can't do the review
myself since I'm mentoring Michal and I was involved in creating the
patch.

[Pavel Březina]

On 02/11/2014 12:15 PM, Michal Šrubař wrote:
> Hi,
>
> those two patches fixes https://fedorahosted.org/sssd/ticket/1983.
> Sudo modul will be now installed into $libdir/sssd/modules and no longer
> into
> $libdir but because specfile has to work everywhere we have to add
> --with-sudo-lib-path=$libdir for this time. For next update to F-20 we
> can add
> something like:

Hi,
have you spoken about sudo side with dkopecek?
> if fedora_version >= 20; then
>      sudo-lib-path=$libdir/sssd/modules;
> else
>      sudo-lib-path=$libdir;

this condition should be already present in this patch. However, 
coordinate please with Jakub and dkopecek in which Fedora version it 
will actually land.

Can you also amend the description of --with-sudo-lib-path please?

Otherwise the patch looks good. Welcome aboard!
> From 5e94532fe5b50cdfd16ddb4e7cf5a007e0fcc58c Mon Sep 17 00:00:00 2001
> From: Michal Srubar 
> Date: Tue, 11 Feb 2014 12:01:28 +0100
> Subject: [PATCH] sudo modul is now installed into $libdir/sssd/modules by
>   default and no longer into $libdir
> https://fedorahosted.org/sssd/ticket/1983
>
> contrib/sssd.spec.in | 1 +
>   src/conf_macros.m4   | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
> index
> 6bc2aa2a41bf100cfadda63ad83850e4b980647f..36627c591dfe28857554182c8aebe64ff672a639
> 100644
> --- a/contrib/sssd.spec.in
> +++ b/contrib/sssd.spec.in
> @@ -417,6 +417,7 @@ autoreconf -ivf
>       --with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
>       --enable-nsslibdir=/%{_lib} \
>       --enable-pammoddir=/%{_lib}/security \
> --with-sudo-lib-path=/%{_libdir} \
>  --disable-static \
>  --disable-rpath \
>  %{?with_ccache} \
>
> diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
> index
> 4be819d4a3389dfcf89a0452aab8165c0ec216e4..597e9ec6c9b85880616bb89659bbfc09be556470
> 100644
> --- a/src/conf_macros.m4
> +++ b/src/conf_macros.m4
> @@ -588,7 +588,7 @@ AC_DEFUN([WITH_SUDO_LIB_PATH],
>                                  )
>                   ]
>                  )
> sudolibpath="${libdir}"
> sudolibpath="${libdir}/sssd/modules"
>  if test x"$with_sudo_lib_path" != x; then
>      sudolibpath=$with_sudo_lib_path
>  fi