From 12985da25918acf0fad8464acffc012b8c71f9ce Mon Sep 17 00:00:00 2001 From: geos_one Date: Thu, 21 Aug 2008 06:23:47 +0000 Subject: [PATCH] app-admin/fedora-ds-console: Remove patch adding missed files on the first release of the 1.1.1 version corrected in the new 1.1.1 release git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@475 6952d904-891a-0410-993b-d76249ca496b --- app-admin/fedora-ds-console/ChangeLog | 5 + app-admin/fedora-ds-console/Manifest | 3 +- ...ds-console-1.1.1-add_missing_files-1.patch | 197 ------------------ 3 files changed, 6 insertions(+), 199 deletions(-) delete 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 24b03726..e9adb696 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: $ + 21 Aug 2008; Mario Fetka + -files/fedora-ds-console-1.1.1-add_missing_files-1.patch: + Remove patch adding missed files on the first release of the 1.1.1 version + corrected in the new 1.1.1 release + 20 Aug 2008; Mario Fetka fedora-ds-console-1.1.1.ebuild: Correct digest diff --git a/app-admin/fedora-ds-console/Manifest b/app-admin/fedora-ds-console/Manifest index b7d5c3e8..485cec8c 100644 --- a/app-admin/fedora-ds-console/Manifest +++ b/app-admin/fedora-ds-console/Manifest @@ -1,6 +1,5 @@ -AUX fedora-ds-console-1.1.1-add_missing_files-1.patch 7204 RMD160 a87c6bce9928c8626cfa2118c4ab00d35c63b824 SHA1 b75a0e8bf4813c1ad458ecc01621e4dba783c10d SHA256 cdf53cceb6122763e35155b421fcf643ad711cbb3fbb50598ac4cb743b2bcaa1 AUX fedora-ds-console-cvs.sh 347 RMD160 69a9fa2f78e67bfa34cd82e308a31711f138a140 SHA1 c9a81d98534c7a95d5d7f3c41298053d645b157e SHA256 63d38f338db6940523fb8488f884f34f53eeef5945edcfa41a24d7ee2410a33a DIST fedora-ds-console-1.1.1.tar.bz2 803125 RMD160 a84b7a25357d0b355a592d9a29865b16b2a1a169 SHA1 9c0f23650fef06475f89edc4f5fb1b86ee99426d SHA256 945542daffaa4791ca1478377577171c7a68a1a6fa65eba6773ec9e2ea302301 EBUILD fedora-ds-console-1.1.1.ebuild 1945 RMD160 40ae228a562ccf13c55bfefaaa6ad8a4dddd2608 SHA1 cdf8c53a71c1e530e7f67027610d219bf9e90f8e SHA256 56a8e188ac8cea3f0318892136a4b8b13e199be60f13fb94ad6b07b9f1b76c3a -MISC ChangeLog 1340 RMD160 667bda444a0296f8505089bb98e059618d96eca6 SHA1 a2a0ce5d95ef60e5515cf1121d14bacb1370a693 SHA256 cab78f1d5eb089b5eee26f296225d621b32cbe587da6274dc4035a97a774b299 +MISC ChangeLog 1566 RMD160 1933b1c5250ec418238e574dbb6b66d0d898267f SHA1 99fdea574ae51c52ea05526542389add5e7d47c9 SHA256 3779b0360f7182ee3bf26d8c5b97d8e6361c8568742f4e24b3b9ec02a7a75040 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 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 deleted file mode 100644 index 5db12450..00000000 --- a/app-admin/fedora-ds-console/files/fedora-ds-console-1.1.1-add_missing_files-1.patch +++ /dev/null @@ -1,197 +0,0 @@ -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(); -+ } -+} -+