pool/cifs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge real fix from Jeff Layton.

Browse Source 
- autoconf: define CAPNG_LDADD even when it's not set.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=13
This commit is contained in:
Lars Müller 2010-04-13 14:14:10 +00:00 committed by Git OBS Bridge
parent 1ccd8cb8c2
commit 1e8dc6079d
4 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch Normal file
View File

@ -0,0 +1,27 @@
From ff93d3fdbd4f70066f5c7834efa2b85e645727e8 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@samba.org>
Date: Tue, 13 Apr 2010 09:56:41 -0400
Subject: [PATCH] autoconf: define CAPNG_LDADD even when it's not set
...otherwise automake won't replace it in the generated Makefile.
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
configure.ac | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index c56a944..a46c22d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,7 @@ AM_CONDITIONAL(CONFIG_CIFSUPCALL, [test "$enable_cifsupcall" != "no"])
LIBCAP_NG_PATH
if test "x$CAPNG_LDADD" = "x"; then
+ AC_SUBST(CAPNG_LDADD)
AC_LIBCAP
fi
AC_OUTPUT
--
1.6.6.1

18
Makefile.am-wo_libcapng.diff
View File

@ -1,18 +0,0 @@
Author: Lars Mueller <lmuelle at suse dot de>
Subject: Make cifs-utils 4.3 build on systems without libcap-ng
X-Hack-Rate: 100%
X-Reported-Upstream: No
Index: cifs-utils-4.3/Makefile.am
===================================================================
--- cifs-utils-4.3.orig/Makefile.am
+++ cifs-utils-4.3/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal
root_sbindir = "/sbin"
root_sbin_PROGRAMS = mount.cifs
mount_cifs_SOURCES = mount.cifs.c mtab.c util.c
-mount_cifs_LDADD = @LIBCAP@ @CAPNG_LDADD@
+mount_cifs_LDADD = @LIBCAP@
man_MANS = mount.cifs.8

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 13 14:09:46 UTC 2010 - lmuelle@suse.de
- autoconf: define CAPNG_LDADD even when it's not set.
-------------------------------------------------------------------
Fri Apr 9 13:35:41 UTC 2010 - lmuelle@suse.de

2
cifs-utils.spec
View File

@ -28,7 +28,7 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh
Patch: Makefile.am-wo_libcapng.diff
Patch: 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd
%else