From 943988b97e063d0b59987139eeaff20ba1a07d12 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 19 Jan 2008 16:54:43 +0000 Subject: [PATCH] app-admin/fedora-ds-console: add missing files patch git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@337 6952d904-891a-0410-993b-d76249ca496b --- app-admin/fedora-ds-console/ChangeLog | 5 + app-admin/fedora-ds-console/Manifest | 20 +- .../fedora-ds-console-1.1.1.ebuild | 1 + ...ds-console-1.1.1-add_missing_files-1.patch | 197 ++++++++++++++++++ 4 files changed, 215 insertions(+), 8 deletions(-) create mode 100644 app-admin/fedora-ds-console/files/fedora-ds-console-1.1.1-add_missing_files-1.patch diff --git a/app-admin/fedora-ds-console/ChangeLog b/app-admin/fedora-ds-console/ChangeLog index 7347b59b..a006dec9 100644 --- a/app-admin/fedora-ds-console/ChangeLog +++ b/app-admin/fedora-ds-console/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Jan 2008; Mario Fetka + +files/fedora-ds-console-1.1.1-add_missing_files-1.patch, + fedora-ds-console-1.1.1.ebuild: + add missing files patch + 19 Jan 2008; Mario Fetka fedora-ds-console-1.1.1.ebuild: correct oversight diff --git a/app-admin/fedora-ds-console/Manifest b/app-admin/fedora-ds-console/Manifest index f5dc1be7..14bcd262 100644 --- a/app-admin/fedora-ds-console/Manifest +++ b/app-admin/fedora-ds-console/Manifest @@ -1,16 +1,20 @@ +AUX fedora-ds-console-1.1.1-add_missing_files-1.patch 7204 RMD160 a87c6bce9928c8626cfa2118c4ab00d35c63b824 SHA1 b75a0e8bf4813c1ad458ecc01621e4dba783c10d SHA256 cdf53cceb6122763e35155b421fcf643ad711cbb3fbb50598ac4cb743b2bcaa1 +MD5 68742599c7e22ae48d581d833f7f98a4 files/fedora-ds-console-1.1.1-add_missing_files-1.patch 7204 +RMD160 a87c6bce9928c8626cfa2118c4ab00d35c63b824 files/fedora-ds-console-1.1.1-add_missing_files-1.patch 7204 +SHA256 cdf53cceb6122763e35155b421fcf643ad711cbb3fbb50598ac4cb743b2bcaa1 files/fedora-ds-console-1.1.1-add_missing_files-1.patch 7204 AUX fedora-ds-console-cvs.sh 347 RMD160 69a9fa2f78e67bfa34cd82e308a31711f138a140 SHA1 c9a81d98534c7a95d5d7f3c41298053d645b157e SHA256 63d38f338db6940523fb8488f884f34f53eeef5945edcfa41a24d7ee2410a33a MD5 a9736549ecc474198f8b99bc8ba0e816 files/fedora-ds-console-cvs.sh 347 RMD160 69a9fa2f78e67bfa34cd82e308a31711f138a140 files/fedora-ds-console-cvs.sh 347 SHA256 63d38f338db6940523fb8488f884f34f53eeef5945edcfa41a24d7ee2410a33a files/fedora-ds-console-cvs.sh 347 DIST fedora-ds-console-1.1.1.tar.bz2 802587 RMD160 4660bbf097f0ffce127cb8458ea126568f5e195b SHA1 1aa6bcdc46e105c5d302287b5e6803ebc6814062 SHA256 ccce629aa0435f983cac8c6e7aef4d780cbad8889602efa34cb4ccb5a45fdd5f -EBUILD fedora-ds-console-1.1.1.ebuild 1815 RMD160 4d3f96534cc87667b3f91a2fd180a0c205f21a27 SHA1 99d435304e5dc1098193671700db45944469f633 SHA256 89d3298358624af5c610dd47ad98de36df762ea28db56870dca84895805af632 -MD5 bec8582c70e0dd6cdc7162d0ced53711 fedora-ds-console-1.1.1.ebuild 1815 -RMD160 4d3f96534cc87667b3f91a2fd180a0c205f21a27 fedora-ds-console-1.1.1.ebuild 1815 -SHA256 89d3298358624af5c610dd47ad98de36df762ea28db56870dca84895805af632 fedora-ds-console-1.1.1.ebuild 1815 -MISC ChangeLog 936 RMD160 5ded580a03c7bb5b6d19e735be51dd1cbc6efcb1 SHA1 2d6303af09fc70c89b9541b43f5cb942ebfdbc77 SHA256 27eac7afa42876de962dd09da45babcd9273e540f8c6010ff173579a71f2d9a5 -MD5 2f555286a675ef633e52be4cde0c4e1a ChangeLog 936 -RMD160 5ded580a03c7bb5b6d19e735be51dd1cbc6efcb1 ChangeLog 936 -SHA256 27eac7afa42876de962dd09da45babcd9273e540f8c6010ff173579a71f2d9a5 ChangeLog 936 +EBUILD fedora-ds-console-1.1.1.ebuild 1866 RMD160 19ab12c0fc0e6bfe92c1f42f6a5b1481d8512721 SHA1 da0dfc4edff5c11d91a082303297f8a28a73ddef SHA256 ad8512c64343ed4cece748584b4e41c93a400dc8c69d44087514d2a1b9eb7ab9 +MD5 684d2a1cb74293d6f4e74f35b4545081 fedora-ds-console-1.1.1.ebuild 1866 +RMD160 19ab12c0fc0e6bfe92c1f42f6a5b1481d8512721 fedora-ds-console-1.1.1.ebuild 1866 +SHA256 ad8512c64343ed4cece748584b4e41c93a400dc8c69d44087514d2a1b9eb7ab9 fedora-ds-console-1.1.1.ebuild 1866 +MISC ChangeLog 1105 RMD160 749ebe1cefbf8ffbc1ad1f5ffe558489272ed59c SHA1 2636cb53bf9374b5cdeaf0ace3a77321317284cc SHA256 70c358cba06e903c72443ba16a4166d95dbfe69eba5aa88995e1edf30a78e714 +MD5 2dce0eef6dadd27f36282b7019cca61a ChangeLog 1105 +RMD160 749ebe1cefbf8ffbc1ad1f5ffe558489272ed59c ChangeLog 1105 +SHA256 70c358cba06e903c72443ba16a4166d95dbfe69eba5aa88995e1edf30a78e714 ChangeLog 1105 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 diff --git a/app-admin/fedora-ds-console/fedora-ds-console-1.1.1.ebuild b/app-admin/fedora-ds-console/fedora-ds-console-1.1.1.ebuild index 7225786c..41e35656 100644 --- a/app-admin/fedora-ds-console/fedora-ds-console-1.1.1.ebuild +++ b/app-admin/fedora-ds-console/fedora-ds-console-1.1.1.ebuild @@ -26,6 +26,7 @@ DEPEND=">=virtual/jdk-1.5 src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/${P}-add_missing_files-1.patch # gentoo java rules say no jars with version number # so sed away the version indicator '-' sed -e "s!-\*!\*!g" -i build.xml diff --git a/app-admin/fedora-ds-console/files/fedora-ds-console-1.1.1-add_missing_files-1.patch b/app-admin/fedora-ds-console/files/fedora-ds-console-1.1.1-add_missing_files-1.patch new file mode 100644 index 00000000..5db12450 --- /dev/null +++ b/app-admin/fedora-ds-console/files/fedora-ds-console-1.1.1-add_missing_files-1.patch @@ -0,0 +1,197 @@ +Submitted By: Mario Fetka (mario-fetka at gmx dot at) +Date: 2008-01-19 +Initial Package Version: 1.1.1 +Origin: me +Upstream Status: unknown +Description: add missing files + +diff -Naur fedora-ds-console-1.1.1.orig/src/com/netscape/admin/dirserv/task/Export.java src/com/netscape/admin/dirserv/task/Export.java +--- fedora-ds-console-1.1.1.orig/src/com/netscape/admin/dirserv/task/Export.java 1970-01-01 00:00:00.000000000 +0000 ++++ src/com/netscape/admin/dirserv/task/Export.java 2005-07-18 00:56:17.000000000 +0000 +@@ -0,0 +1,95 @@ ++/** BEGIN COPYRIGHT BLOCK ++ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. ++ * Copyright (C) 2005 Red Hat, Inc. ++ * All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation version 2 of the License. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * END COPYRIGHT BLOCK **/ ++ ++package com.netscape.admin.dirserv.task; ++ ++import java.util.Hashtable; ++import java.awt.Component; ++import javax.swing.JFrame; ++import com.netscape.management.client.IPage; ++import com.netscape.management.client.console.ConsoleInfo; ++import com.netscape.admin.dirserv.panel.BackupPanel; ++import com.netscape.admin.dirserv.DSUtil; ++import com.netscape.admin.dirserv.IDSModel; ++import com.netscape.admin.dirserv.ExportImportProgressDialog; ++ ++/** ++ * Netscape Directory Server 4.0 task for exporting a database to LDIF. ++ * ++ * @author rweltman ++ * @version %I%, %G% ++ * @date 9/15/97 ++ * @see com.netscape.admin.dirserv.DSAdmin ++ * @see com.netscape.admin.dirserv.task.CGIReportTask ++ */ ++public class Export extends CGITask { ++ /** ++ * Constructor for the Export Directory Task ++ */ ++ public Export( ConsoleInfo info ) { ++ _consoleInfo = info; ++ _sCmd = "Tasks/Operation/Export"; ++ _section = "Export"; ++ setName(DSUtil._resource.getString(_section,"title")); ++ } ++ ++ /** ++ * Export to LDIF ++ * ++ * @param filename Full path of file to export to. ++ * @param subtree A subtree to export ++ * @return true if the export succeeded. ++ */ ++ public boolean exec( String filename, String subtree, Component comp ) { ++ String sAdminURL = _consoleInfo.getAdminURL(); ++ ++ String fullCmd = sAdminURL + _consoleInfo.get( "ServerInstance" ) + ++ "/" + _sCmd; ++ Hashtable args = new Hashtable(); ++ args.put("filename", filename); ++ if ( subtree != null ) { ++ args.put("subtree", subtree); ++ } ++ IDSModel model = ++ (IDSModel)_consoleInfo.get( "dsresmodel" ); ++ CGIThread task = new CGIThread( fullCmd, args, model, _section ); ++ String title = _resource.getString("dirtask", _section+"-title"); ++ JFrame frame = model.getFrame(); ++ ExportImportProgressDialog dlg = ++ new ExportImportProgressDialog( ++ frame, task, title, ++ false, comp ); ++ task.addEntryChangeListener( dlg ); ++ dlg.setModal( true ); ++ /* Let the dialog run the thread */ ++ dlg.setVisible( true ); ++ showResultDialog( task ); ++ return task.getStatus(); ++ } ++ ++ /** ++ * Export to LDIF ++ * ++ * @param filename Full path of file to export to. ++ * @return true if the export succeeded. ++ */ ++ public boolean exec( String filename, Component comp ) { ++ return exec( filename, null, comp ); ++ } ++} +diff -Naur fedora-ds-console-1.1.1.orig/src/com/netscape/admin/dirserv/task/Import.java src/com/netscape/admin/dirserv/task/Import.java +--- fedora-ds-console-1.1.1.orig/src/com/netscape/admin/dirserv/task/Import.java 1970-01-01 00:00:00.000000000 +0000 ++++ src/com/netscape/admin/dirserv/task/Import.java 2005-07-18 00:56:17.000000000 +0000 +@@ -0,0 +1,87 @@ ++/** BEGIN COPYRIGHT BLOCK ++ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. ++ * Copyright (C) 2005 Red Hat, Inc. ++ * All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation version 2 of the License. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * END COPYRIGHT BLOCK **/ ++ ++package com.netscape.admin.dirserv.task; ++ ++import java.util.Hashtable; ++import java.awt.Component; ++import javax.swing.JFrame; ++import com.netscape.management.client.IPage; ++import com.netscape.management.client.console.ConsoleInfo; ++import com.netscape.admin.dirserv.panel.BackupPanel; ++import com.netscape.admin.dirserv.DSUtil; ++import com.netscape.admin.dirserv.IDSModel; ++import com.netscape.admin.dirserv.ExportImportProgressDialog; ++ ++/** ++ * Netscape Admin Server 4.0 task for importing an LDIF file. ++ * ++ * @author rweltman ++ * @version %I%, %G% ++ * @date 03/09/98 ++ * @see com.netscape.admin.dirserv.DSAdmin ++ * @see com.netscape.admin.dirserv.task.CGIReportTask ++ */ ++public class Import extends CGITask { ++ /** ++ * Constructor for the Import Directory Task ++ */ ++ public Import( ConsoleInfo info ) { ++ _consoleInfo = info; ++ _sCmd = "Tasks/Operation/Import"; ++ _section = "Import"; ++ setName(DSUtil._resource.getString(_section,"title")); ++ } ++ ++ /** ++ * Import from LDIF ++ * ++ * @param filename Full path of file to import. ++ * @return true if the import succeeded. ++ */ ++ public boolean exec( String filename, boolean saveConfig, ++ Component comp ) { ++ String sAdminURL = _consoleInfo.getAdminURL(); ++ String fullCmd = sAdminURL + _consoleInfo.get( "ServerInstance" ) + ++ "/" + _sCmd; ++ Hashtable args = new Hashtable(); ++ args.put("filename", filename); ++ args.put("saveconfig", saveConfig ? "true" : "false"); ++ IDSModel model = ++ (IDSModel)_consoleInfo.get( "dsresmodel" ); ++ CGIThread task = new CGIThread( fullCmd, args, model, _section ); ++ String title = _resource.getString("dirtask", _section+"-title"); ++ JFrame frame = model.getFrame(); ++ ExportImportProgressDialog dlg = ++ new ExportImportProgressDialog( ++ frame, task, title, ++ false, comp ); ++ /* Allow disposing of the dialog from the system menu. This will ++ not cancel the action, but if import hangs (because it's out ++ of disk space), you can continue using the console. */ ++ dlg.setDefaultCloseOperation( dlg.DISPOSE_ON_CLOSE ); ++ task.addEntryChangeListener( dlg ); ++ dlg.setModal( true ); ++ /* Let the dialog run the thread */ ++ dlg.setVisible( true ); ++ showResultDialog( task ); ++ return task.getStatus(); ++ } ++} ++