Add patch to fix upstream rename of csync -> ocsync. Fixes bug #438510.

Package-Manager: portage-2.1.11.28/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 83 insertions, 18 deletions

diff --git a/sys-auth/pam-csync/ChangeLog b/sys-auth/pam-csync/ChangeLog
index fb44c27b0d41..0d5ed0082361 100644
--- a/sys-auth/pam-csync/ChangeLog
+++ b/sys-auth/pam-csync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam-csync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/ChangeLog,v 1.2 2012/08/28 13:22:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/ChangeLog,v 1.3 2012/10/17 06:19:38 kensington Exp $
+
+*pam-csync-0.42.0-r1 (17 Oct 2012)
+
+  17 Oct 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/pam-csync-0.42.0-ocsync.patch, +pam-csync-0.42.0-r1.ebuild,
+  pam-csync-0.42.0.ebuild:
+  Add patch to fix upstream rename of csync -> ocsync. Fixes bug #438510.
 
   28 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> pam-csync-0.42.0.ebuild:
   Raise the dep over iniparser to be same as on csync.
diff --git a/sys-auth/pam-csync/Manifest b/sys-auth/pam-csync/Manifest
index 3eea62f32ecc..5c031020f6d9 100644
--- a/sys-auth/pam-csync/Manifest
+++ b/sys-auth/pam-csync/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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.ebuild 612 SHA256 0bcfa84677e9e74f7b0216339b377ab1a299be64847ddf4971cbee59f0d2692d SHA512 24a53c8ac7941ba9f411e90f42d3a1ea02f4fc5a6748152f377904b6292f07f476fbfd4b7ad652457d5a38dbcdbd6934adafe08222fa585f98bfd1237714bbda WHIRLPOOL df071a23e00a90ec82a71eb47954ffb7894410dcf4afc89ebaee40e6446948ea603a3431031d5cf61043f0b3315a9f2d3393a98dabe64c69ebb2ed7715ba4b3c
-MISC ChangeLog 535 SHA256 7a47529a21e025d050da947d06166a8ba6e05ab462cb875d4b9ee95cca361221 SHA512 60dc821d26c605fc891bf87bd548d586e1d67d0c7d81de33389a50637bb14d85e91ad401fffe00cea349a1fcfa438cda17268f7e13aaad6a2617c3dbacac6e62 WHIRLPOOL fa7f9f8b9d22fd61207bb2bf60a4e3ac483d411ebba2519e034e8cbd9083c9a1e011b825e833da6cabcc1845f052fae3ea5ffd3ab7aa5d4194a7c4caff323475
+EBUILD pam-csync-0.42.0-r1.ebuild 670 SHA256 399c226ef1aa9f2e077b5b4edbbfd50344c5a79bf53fa13b5b383aacd4f5f4fa SHA512 e998427fa4023190da2ec12dc202fbfe7bf617d99a657d800b912875c18a74831dd9a81ff650838b8e04d1071ef71769db3b1aa23482ddfcc9902cfd686d822e WHIRLPOOL 751e763b50afd260b140c652f9411ba0e6c218d7ceee0939dc740e2cacd686ffb57225793c351d7d12eb35e7e1f9a9058d688e54ee2f805362e454049bb600d9
+EBUILD pam-csync-0.42.0.ebuild 621 SHA256 2cdee111f7a8d54f6e035b6bfdcebee62461b1a0f768de0bb953f742f67ce097 SHA512 69a748ee6d0894d9e5e1c43fea4bcbe4d2523519df7ff13d11b4277fbf30bd1a0e4c3b517aa49686159e579accfb2afc5355ec675763f6a21c075e2df3f654a8 WHIRLPOOL 867c94e2a92c9d1ca7d36e0dd969448f98aa0758281322251af10de9fde08b0e65c147ca31720b02b675cf63839d3610432febcacb6a2b66fa5c8c37caf52be4
+MISC ChangeLog 799 SHA256 15d897ee69b2afdfd34c0568c0ad1ba01468ba511017e31dd1694d251f8b0ca8 SHA512 58f5dcd3271628e87267499a89c309a2c41170be89175dc6c3a9aee63d905fd02b469a4b591c532dcc8424c10c5a0b988e513649739c6fbfe1d73d875b7eabf7 WHIRLPOOL 545f226b29b0a3e907894bf7062a584ebb92ac9c47e4d76bbebad9a39effe59a1e133fc34d5f426ee0b4f4e546d3983fd29980cded8887e00577295735aa9fb2
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQPMX9AAoJEOSiRoyO7jvoUaIQAJbC7O27oymloAogbWW6yJoK
-/10xgjBbxnxHF+J+m2JWAJFue70kRqe/frekRsfS0+pOhzMyKU1w2ZEzCi9Qywjk
-bhYDxBIADhV4r7jR4x37I/232ikQXnHcXXSjNde9yed+sLPKrSmNG/WYNgRmySo3
-RDibIhz75jxG0LvkgIXa/jOMowpYet14QSBYgtgnLfxwMQRJPvdPGf6IAfgWrtnh
-2AXaNCL4EzdOaDrTXLPS6tPpyxc/G+eKcFDjNirv6nTz/SPTuEjIuAMucG7HwUiU
-DoQnhjf5cx9qKgsgryPnnrNr1g9b9xGjNHgDuOWEq1l9NEmED9D5U/5M/ewu0xTz
-O6sBvaynokj54wCWRQaSRdpuQG+cQefjzEYV1pq8MzA15Oa85QttdCXQWXLnr3VJ
-xuF9wstIRVvK87nvYtxdpU9P3eMkQieaUy0jEfVJexvhxDNG77bJgiK6l919WEZ5
-oell9Gv+QbtqaUG9NfA90FtFyJrxd2A7Ryj0V4c/6iMIP8ykaarW1IxSCq/L0ysx
-KfADZQFp3G1mpjW2PlHrTbxRLmNV7aaMHJ8cSj5Q/0SeX9rYOTx1dqzw1beD1v4K
-trAEgtobd8oIgfJyvDu48wbGHCPu641B2VmpjVG2hJKX9ih18zrxeYeKCMgSzejT
-BvD0RoCCfimxS02gvZrk
-=B1u3
+iQEcBAEBCAAGBQJQfk2qAAoJEMbwO6tnXQ0ssmoIAKfWNEekmiwFtzncbqEdXlZh
+vHU0Uls6iZ/pxITIrrdDrylYPRswO3iC1K5C9sScjfFJBRcbBMirPzmMrH/jDlHj
+oSIpRbSa4Bc5HIIJyT6UL3ChRZVB8S8QxqxM6cAfQ1Qo8k5/MkJDPbKwTO287ws6
+2JbgRZWkxWjSFYDNUniheqPNyaDy33MLd/aoD1uK/eVyLT6OPpK98a/uiqSa8wqe
+WJb7VU158Y4VG7RMByFV3Q5AaZRD+VQRaUoLIs0sb6PeDBA89aE3CYpfLHM6dy1u
+wfBCrFNmqCStfDs8knE98mwi6Q6xLuKQYyx3K1UGH1S6Gb+VJJHjPXrCPhJj7XI=
+=WC02
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch b/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch
new file mode 100644
index 000000000000..117a2b0db26f
--- /dev/null
+++ b/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch
@@ -0,0 +1,33 @@
+Since 0.60.0, upstream renamed to "ocsync".
+
+--- cmake/Modules/FindCSYNC.cmake
++++ cmake/Modules/FindCSYNC.cmake
+@@ -20,7 +20,7 @@
+ else (CSYNC_LIBRARIES AND CSYNC_INCLUDE_DIRS)
+   find_path(CSYNC_INCLUDE_DIR
+     NAMES
+-      csync/csync.h
++      ocsync/csync.h
+     PATHS
+       /usr/include
+       /usr/local/include
+@@ -30,7 +30,7 @@
+ 
+   find_library(CSYNC_LIBRARY
+     NAMES
+-      csync
++      ocsync
+     PATHS
+       /usr/lib
+       /usr/local/lib
+--- src/pam_csync.c
++++ src/pam_csync.c
+@@ -50,7 +50,7 @@
+ #include <security/pam_modutil.h>
+ #include <security/pam_ext.h>
+ 
+-#include <csync/csync.h>
++#include <ocsync/csync.h>
+ 
+ #include "pam_csync.h"
+ #include "config.h"
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
new file mode 100644
index 000000000000..c7bd72a042cf
--- /dev/null
+++ b/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 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.1 2012/10/17 06:19:37 kensington Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="PAM module to provide roaming home directories for a user session"
+HOMEPAGE="http://www.csync.org/"
+SRC_URI="http://www.csync.org/files/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/iniparser-3.1
+	>=net-misc/csync-0.60.0
+	virtual/pam
+"
+DEPEND="${DEPEND}
+	app-text/asciidoc
+"
+
+S="${WORKDIR}/${P/-/_}"
+
+PATCHES=( "${FILESDIR}/${P}-ocsync.patch" )
diff --git a/sys-auth/pam-csync/pam-csync-0.42.0.ebuild b/sys-auth/pam-csync/pam-csync-0.42.0.ebuild
index 6adeac515fe9..1285125c3a0a 100644
--- a/sys-auth/pam-csync/pam-csync-0.42.0.ebuild
+++ b/sys-auth/pam-csync/pam-csync-0.42.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.2 2012/08/28 13:22:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-csync/pam-csync-0.42.0.ebuild,v 1.3 2012/10/17 06:19:37 kensington Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/iniparser-3.1
-	net-misc/csync
+	<net-misc/csync-0.60.0
 	virtual/pam
 "
 DEPEND="${DEPEND}