Add patch from openSUSE to avoid configure failure with newer dev-util/cmake wrt...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/sys-auth/pam-csync/ChangeLog b/sys-auth/pam-csync/ChangeLog
index 401cb2be99ed7033d3ff0f643480339f2fb69e4f..ab45ad2a00fc73c35693d7710b408df1a8c74ca4 100644 (file)
--- 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/Manifest b/sys-auth/pam-csync/Manifest
index f95e92776b46ef04b0d3fc9f605fedfcf89a0b2e..7a85a893136b33a4c4c462083fc9d7a90d7a7621 100644 (file)
--- a/sys-auth/pam-csync/Manifest
+++ b/sys-auth/pam-csync/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pam-csync-0.42.0-cmake.patch 675 SHA256 4515bb78b43346a15ef6a69e3689c544d35b72a1f74fd44e02cd1221644e70a0 SHA512 108a06df80a41dcfa8a44e6d2fee83a57f235091117c22efdb8d255dec332268976d88828f439ee3f887c3d573bfe418b1edf08f2a114eac54c39a1ef504243f WHIRLPOOL 771af726af22b93cd7bfd37c1a689039b20cd5cbc59f5be95c8133fa61d3a9004d68080932018bd38c4514c2f8ae96fed3319074f6ee406b0cc8bbb04a435b16
 AUX pam-csync-0.42.0-ocsync.patch 683 SHA256 b0d8e7f02d41355e5a238a07f3a1c408e429be1769337e4b30388e020f0fbe11 SHA512 958f16e870b15486da20f775a1f4b732b8373c03aa41518570ee9aaba546c695a65ba1bda9a481f3dacaa2a91d3a86d20a1b5977001ceecf2d2582031166f47a WHIRLPOOL 82ce523201721023abafd8044ffe531a122c2223940edeb3411ce45a95f971f2f998084dfdf9ab30d868d4f4cd6ca868cceb988d2bcf21adb55b5cda3ec5fa3b
 DIST pam_csync-0.42.0.tar.gz 30457 SHA256 bba01854ee5929ecc90428275a50f804d361e92f2805f1d2eff7d3f2bca48802 SHA512 ef6d0fbadf6afdf5a5adad1905e976330506fdf60835aa4190959b855fbc2c4c61bd709fe2aaaab731ec5430c999b3fd5e23f3a81c35a7b266b23cd092d24e06 WHIRLPOOL b81a0a9ad1e0188856cc6ffc265c44cc67a3603fb550bc59c4aa8a63198a9898d389238a7582c439add1528eaba6bf2aa930d65dd3429c901d9e6b3ecb2328ac
-EBUILD pam-csync-0.42.0-r1.ebuild 669 SHA256 59afbee35070528d4313d2ce279cd3b6859c1029a9927f4a608440b5f92b6652 SHA512 31409d1c7a912febd0277aebb4ddc08c9336532e9ba54b3977bc266799a75b6e617f7b896764d787a45ad16b8e194694d4b573e3b389e6fb1f378d7016adc7c1 WHIRLPOOL 24479126ad945efc276e167ff8ede53f9427fd2120004e7a48c0318a59bcffa03d99663748f46344c55d6391487e2a39772fb7293a8f0647a1b7edcb24773223
-MISC ChangeLog 1139 SHA256 6b713b95b7e04c317238c873fb9540e6050dea31a648164d530f13bd3e65b4e2 SHA512 307a1f345c1195c30e413c9f5d58626081b1bb42eaa72584fb47d2776bbadd9cadc9fae785c7501bab6ddad57ac125d58b3da2a8c862c129c8db4e43628325e6 WHIRLPOOL 9af71b3703a679cb6c6098914969c7b7ce61e795f6f1eac2d38a7a61cd99dff1ecce000eba86764db22d1c55aab9bfa717d5ed7abfe6d60f3a3c36119e935919
+EBUILD pam-csync-0.42.0-r1.ebuild 704 SHA256 6ae4da00305fa82693c6e7d907d63fcce965e856990b64b037cbd306d2e155f2 SHA512 4c6b35a66e101571c8d44366066ca186347fd82069b58e375c8d21e8da7a73e3b466c42a6afdc3069ce4fd61eefad72d5c27d251a458c7509a0a1ee3609fff2e WHIRLPOOL 942ffa39412040d000f54606725ceea311522e7be39b897543250f79726acbf919f204b5646d2aad90448e31aead7f05808cf25b562e4d48545d9da55aaa14f5
+MISC ChangeLog 1361 SHA256 1e4b7328b988dd9187aa109db8c93897f75cb0af990ded713d82dbb6e81d15a3 SHA512 a56a336d2dbcda310749f08ca8335ccc27d76ce4e219b4231425db004b476dece6cbb5b6e821422ffe1b7674bdd83f17cce0b845bdb6933e3767c3969ce00a92 WHIRLPOOL a1829bd1e37c847f45bf60a432a03ac4887d3f9e6514cff72b4f86e3c1e673e8d2c12c42f6865d97820e9124c9a025ad7b8dfc11eb4fc32789e0303208f4eb49
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUc10fRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVJsSNRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7CIzD/0V8Dn8OVFHv4ohyWcXjasGbRxSOS1wPsXy3F+7QYVsMn+RfEqd53niLXOL
-lSfgQX1xGRRG6pk+DipKhEtKGZOA2CR3MLTXMHIZXceGOksiEf7xc1Sl7PHFVyd/
-ZN3RtxBNbbAnkiGChxu7N7zpe6AtbBYHlveLULAKGaIKPgqyWS8NiKG3PivuGcYU
-JsCNvNJtMz9kjnCj/WusbZE1f6+oMNIe7RYpR49nBSHKHVUz0XOSTI6+QvmKrV7m
-MeY1Cbn0J6JwC/0d/sTh2ZxjE9CWftPqkb7bkGnj/l0hAd7337jtw4j5bSDsLmR/
-1fLgkXkm5diBl53g6cfMpHOFeT+A6ZZgup26+u2uv2SNBVD5+HHtwt+Plvh7IUYy
-wcPiWxg4qmVe6I2GIH6gcHeSdBqoafKwjSWCQvgxyZcYf1aUbSKfQOizlg4VJ4xF
-0W7UliX6cVDrYEatCEsIWMKoMNx3m6pYJKI0uaB4R7C2BuuKYpv1xsOy24RN7iNw
-OxxqLAwot4ZTF7pyak4+n4O3kBQA6o3lrY+4vF0sBU3ILSH7CvYRmI4+VyrmGB4w
-xZPCnVuIPbmfzgwC1hzZvAyVbus7jsjScyRIVQ29OBvcZ5pe22g0p4vjb4y8RrU8
-cmaFR5XJBETYGhNV2+XwKL85wBjRoieH9FzF5C2iM2d3m9qnHA==
-=t6A1
+7OX4EACMwpCXXfjvTo1LJRL3wxfEOEhinNQZlscOdFOicemTpNsy+PwcVfPIM8II
+BXnEyM4hMlYp96TXIwCPTMLoVQPZa4e9QRq9ve0bjkrvCgOPxVKJJRahcSSFG8BZ
+h3rQJYCeZ/nalW2EGYNI6S+4PsPot/WxlHXPxZChvRfT3GV7YEKkdl7IwNo1khUi
+Cc+p7VF6ZKaWPT2oFVOm+Yz8u4uoCatC5TISbaXPBy4192XjTexZAZmFl5cyrf1J
+0LsNhRcspNqJXnf/nqhIG4qd+f2rLNv2Xuv8tFe4qNyDM3vzKRQFqyfjws7zI4Mk
+05QwHNxgBFo39mOB4/B3vq1K4RS31jhsasWHtTNUGoScbSfl764HT8+dYfbObm/8
+m70c2v6pxLqkX3EgRUynQpZQ5q73//ZKysJJ1v4MMJLprFcptOYP5U7Bqh61O/dI
+WwkL95bUBrQhdv12ovsyMwdNzfXwcfybKutnB4Bne4u65yZoaL1IgagRBpQhlC9c
+WgalcS8rnelpeqzxhioS4piltx37M90Uwoi8NCduVk17M4qEkt3pIQquU4QraXl0
+FFHajRcJNGLgS+9hzzkMab08/RV+hReSx7HBSxZyuOQX7/DCpUYPQI4pRGqL+pSJ
+sz7HlalKDE9/vuBeb1V7f6tTTY5dAIjzkxkjnPhCKgfGvpLdQg==
+=5L6D
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..2b650d2
--- /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 4cc5b6e1d55b53d42a82a3b93fd131abf6d18f5e..6aa51dc1aa866e830d93ae5aca47f04164ca7306 100644 (file)
--- 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"
+)