app-admin/mmc-web-base: add bulkimport

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1882 6952d904-891a-0410-993b-d76249ca496b

app-admin/mmc-web-base/ChangeLog

@@ -1,7 +1,12 @@
 # ChangeLog for app-admin/mmc-web-base
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2010; Mario Fetka <mario.fetka@gmail.com>
+  mmc-web-base-2.3.2_p642.ebuild,
+  +files/mmc-web-base-2.3.2-bulkimport-1.patch:
+  add bulkimport
+
   05 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +mmc-web-base-2.3.2_p642.ebuild, +files/mmc-web-base-2.3.2-gentoo-3.patch:
   use special pulse2 version

app-admin/mmc-web-base/Manifest

@@ -1,3 +1,4 @@
+AUX mmc-web-base-2.3.2-bulkimport-1.patch 1770 RMD160 0d6a4336193c2040eae0864a8799d200b6106cab SHA1 a4d668a80fbe8f94337e9cf3cf6a3a9d29441c93 SHA256 36dbea351a712ccc0bf5e031695b047d251f72c3cc5cc9a7b1f50a8b567451a2
 AUX mmc-web-base-2.3.2-gentoo-1.patch 1091 RMD160 3d69f88be2133b61a316a6ff7c51a13bfe9da4f6 SHA1 dda41e71c04bb6586cf64fc848dc35e356f8d7b2 SHA256 1ba031d2a9744ccf2983769dd5c363f9c983ff7275e0dd208d122d89b0bd0417
 AUX mmc-web-base-2.3.2-gentoo-2.patch 1121 RMD160 e101b31b7969b215c50290cb210201b62b873db4 SHA1 d1589fb29c4fa1e3749bae538303e1c84cda5037 SHA256 070f06dbe933b61e972cae6506f4f722d0fbeae792d4b336e5376b6634ae8d75
 AUX mmc-web-base-2.3.2-gentoo-3.patch 1136 RMD160 b1d022792ea150e3dbf67c7b2508a7911eaf49b0 SHA1 f2de38e247700fff46c9250b095ab8c1c671df30 SHA256 5aaf411c1e7722f4a04f4006f6e5a31b6a9b517da8853be80bf1019c50c5e409
@@ -6,6 +7,6 @@ DIST mmc-web-base-2.3.2.tar.gz 457181 RMD160 50fddf40426ca2dcecc1c7ea070d633c62a
 EBUILD mmc-web-base-2.3.2-r1.ebuild 884 RMD160 e349ec9a48d32c90e89370c3b9d8a01b97b0b0d8 SHA1 f0d1f58009d7672eb88105e0722457656c025f18 SHA256 96fb6f9793f86ddca9ff997eb214a6dbef15a28394bdd886079bbde64de603a5
 EBUILD mmc-web-base-2.3.2-r2.ebuild 902 RMD160 fd658e0dd9955d9c6281d7cdde74e647dfcc6743 SHA1 941fb17f6d21996a873f2925eabbeb2845f9f652 SHA256 20f2751f55917de762a2694ed9f1f05bf7f41bbad55732fc32e4371b67c4191c
 EBUILD mmc-web-base-2.3.2.ebuild 1121 RMD160 89b5c1e419aecad6d626773d5eec3ff4114f4327 SHA1 08fa4fb9e2ccca09c6afd906bfacd8d78a7b4e48 SHA256 24b3444b5ad4c37a98cfd030b1888f79e00afe5a99ba00b7efdfaf8fb4c57aec
-EBUILD mmc-web-base-2.3.2_p642.ebuild 1075 RMD160 ab89c01226e42dc54d089c589f7d4f022f1fa07c SHA1 c1d2033514150d433ba8134c0ad404ac316a7f9c SHA256 3c9315165b5d8f7a089503e80bbd001795500942551419298e50b1ceb73c7e9e
+EBUILD mmc-web-base-2.3.2_p642.ebuild 1167 RMD160 21646612f85cc42c8dea13aad98fb9ac3f17b4a3 SHA1 28c9541c1aa5cb1b5be286a53ccaae8eebd333f5 SHA256 704bce87e36177f0b2dd6a51ea280901bfdc9fa4f68bab9ee64749740bbbbca5
-MISC ChangeLog 1541 RMD160 7058bd82f9ca2cb4c873378a6f31486e986d3512 SHA1 8c0e4d3018c2dfdc456227f640b2b7ff15a2f803 SHA256 ca347d47d80dad4201b4e097a48674d3841cf7b43f03afa1236fb9b5d8553e5a
+MISC ChangeLog 1692 RMD160 63c202d8195f9ae9c37692b7a38d7ee2b3e6fc20 SHA1 36714ff574e22f8a4969a86c9c6a2ed63d872688 SHA256 580b3de32a73191761de1e33b2c46462523edb575075610a87c8ef861ba1770f
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

app-admin/mmc-web-base/files/mmc-web-base-2.3.2-bulkimport-1.patch

@@ -0,0 +1,29 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-01-29
+Initial Package Version: 2.3.2
+Origin: https://ml.mandriva.net/wws/arc/mds-devel/2010-01/msg00004.html
+Upstream Status: unknown
+Description: Bulkimport required mods
+ 
+diff -Naur mmc-web-base-2.3.2.orig/main.php mmc-web-base-2.3.2/main.php
+--- mmc-web-base-2.3.2.orig/main.php	2010-01-29 16:07:28.784423139 +0000
++++ mmc-web-base-2.3.2/main.php	2010-01-29 16:24:06.781423783 +0000
+@@ -27,6 +27,7 @@
+ global $conf;
+ 
+ ob_start();
++require ("modules/bulkimport/includes/importUsers.php");                // GLEN (load before session)
+ 
+ require("includes/session.inc.php");
+ require("includes/config.inc.php");
+diff -Naur mmc-web-base-2.3.2.orig/modules/base/users/localSidebar.php mmc-web-base-2.3.2/modules/base/users/localSidebar.php
+--- mmc-web-base-2.3.2.orig/modules/base/users/localSidebar.php	2010-01-29 16:07:28.771423753 +0000
++++ mmc-web-base-2.3.2/modules/base/users/localSidebar.php	2010-01-29 16:16:02.722422771 +0000
+@@ -27,6 +27,7 @@
+ $sidemenu->setBackgroundImage("img/users/icn_users_large.gif");
+ $sidemenu->addSideMenuItem(new SideMenuItem(_("List"), "base","users","index", "img/users/icn_global_active.gif", "img/users/icn_global.gif"));
+ $sidemenu->addSideMenuItem(new SideMenuItem(_("Add"), "base","users","add", "img/users/icn_addUser_active.gif", "img/users/icn_addUser.gif"));
++$sidemenu->addSideMenuItem(new SideMenuItem(_T("Bulk Manager (CSV)"), "base", "users", "bulkimport", "img/users/icn_addUser_active.gif", "img/users/icn_addUser.gif"));
+ 
+ if ($_SESSION["login"] != "root") {   
+     $sidemenu->addSideMenuItem(new SideMenuItem(_("Change your password"), "base","users","passwd", "img/access/icn_global_active.gif", "img/access/icn_global.gif"));

app-admin/mmc-web-base/mmc-web-base-2.3.2_p642.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -22,6 +22,7 @@ DEPEND="sys-apps/lsb-release
 RDEPEND=">=app-admin/mmc-agent-${PV}
 	dev-lang/php[ldap,xmlrpc,nls]
 	virtual/cdrtools"
+PDEPEND="app-admin/mmc-web-bulkimport"
 SLOT="0"
 
 need_php_httpd
@@ -29,6 +30,7 @@ need_php_httpd
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.2-bulkimport-1.patch
 	epatch "${FILESDIR}"/${PN}-2.3.2-gentoo-3.patch
 }