diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-04-09 18:27:22 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-09 18:27:22 +0000 |
| commit | 60426abf30a0eb71764ffa11968d3d7692fb26ea (patch) | |
| tree | 8ae330d740a1813de155c21209354f8eaf4bd5ac /sys-auth | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-60426abf30a0eb71764ffa11968d3d7692fb26ea.tar.gz gentoo-2-60426abf30a0eb71764ffa11968d3d7692fb26ea.tar.bz2 gentoo-2-60426abf30a0eb71764ffa11968d3d7692fb26ea.zip | |
Add patch from openSUSE to avoid configure failure with newer dev-util/cmake wrt bug #529790.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/pam-csync/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch | 25 | ||||
| -rw-r--r-- | sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild | 9 |
3 files changed, 38 insertions, 5 deletions
diff --git a/sys-auth/pam-csync/ChangeLog b/sys-auth/pam-csync/ChangeLog index 401cb2be99ed..ab45ad2a00fc 100644 --- a/sys-auth/pam-csync/ChangeLog +++ b/sys-auth/pam-csync/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-auth/pam-csync -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/ChangeLog,v 1.6 2014/11/24 16:30:00 kensington Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/ChangeLog,v 1.7 2015/04/09 18:27:22 kensington Exp $ + + 09 Apr 2015; Michael Palimaka <kensington@gentoo.org> + +files/pam-csync-0.42.0-cmake.patch, pam-csync-0.42.0-r1.ebuild: + Add patch from openSUSE to avoid configure failure with newer dev-util/cmake + wrt bug #529790. 24 Nov 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml: Drop to maintainer-needed. diff --git a/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch b/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch new file mode 100644 index 000000000000..2b650d232e2a --- /dev/null +++ b/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch @@ -0,0 +1,25 @@ +From 21dfcf6343cec2feb0e4ebd8b9e22a3aa39e5d9d Mon Sep 17 00:00:00 2001 +From: Jim McDonough <jmcd@samba.org> +Date: Mon, 10 Mar 2014 10:16:28 -0400 +Subject: [PATCH 1/2] Remove backward compatibility option for newer cmake + builds to work. + +--- + src/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6732a3f..40225e4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,7 +41,6 @@ include_directories( + ${PAM_CSYNC_PRIVATE_INCLUDE_DIRS} + ) + +-set(CMAKE_BACKWARDS_COMPATIBILITY "2.2") + macro_add_plugin(${PAM_CSYNC_LIBRARY} ${pam_SRCS}) + + target_link_libraries(${PAM_CSYNC_LINK_LIBRARIES}) +-- +1.8.4.5 + diff --git a/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild b/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild index 4cc5b6e1d55b..6aa51dc1aa86 100644 --- a/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild +++ b/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild,v 1.2 2014/02/07 08:55:08 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild,v 1.3 2015/04/09 18:27:22 kensington Exp $ EAPI=4 @@ -26,4 +26,7 @@ DEPEND="${DEPEND} S="${WORKDIR}/${P/-/_}" -PATCHES=( "${FILESDIR}/${P}-ocsync.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-ocsync.patch" +) |