From 1bbe77c52425eb467bf0b3b12fdc3a8d7e423aa5 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Thu, 26 Jan 2006 07:44:08 +0000 Subject: Remove obsolete versions. Mark 3.2.8 stable on x86 (#120352). Version bump. Package-Manager: portage-2.0.53 --- net-proxy/paros/files/digest-paros-3.2.1 | 1 - net-proxy/paros/files/digest-paros-3.2.3 | 1 - net-proxy/paros/files/digest-paros-3.2.9 | 1 + net-proxy/paros/files/paros-3.2.1-unixhome.patch | 200 ----------------------- net-proxy/paros/files/paros-3.2.3-unixhome.patch | 189 --------------------- 5 files changed, 1 insertion(+), 391 deletions(-) delete mode 100644 net-proxy/paros/files/digest-paros-3.2.1 delete mode 100644 net-proxy/paros/files/digest-paros-3.2.3 create mode 100644 net-proxy/paros/files/digest-paros-3.2.9 delete mode 100644 net-proxy/paros/files/paros-3.2.1-unixhome.patch delete mode 100644 net-proxy/paros/files/paros-3.2.3-unixhome.patch (limited to 'net-proxy/paros/files') diff --git a/net-proxy/paros/files/digest-paros-3.2.1 b/net-proxy/paros/files/digest-paros-3.2.1 deleted file mode 100644 index 18b2817c30ef..000000000000 --- a/net-proxy/paros/files/digest-paros-3.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f716bdd16cdfdf9a95fc9ec014401bad paros-3.2.1-src.zip 3151758 diff --git a/net-proxy/paros/files/digest-paros-3.2.3 b/net-proxy/paros/files/digest-paros-3.2.3 deleted file mode 100644 index 7e0e92608f23..000000000000 --- a/net-proxy/paros/files/digest-paros-3.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 d54b98f6866f2753706ab9b7db0befa3 paros-3.2.3-src.zip 4428948 diff --git a/net-proxy/paros/files/digest-paros-3.2.9 b/net-proxy/paros/files/digest-paros-3.2.9 new file mode 100644 index 000000000000..a1811f8bd01c --- /dev/null +++ b/net-proxy/paros/files/digest-paros-3.2.9 @@ -0,0 +1 @@ +MD5 748ed1c2741dbe86479bf7c28656fab3 paros-3.2.9-src.zip 5078432 diff --git a/net-proxy/paros/files/paros-3.2.1-unixhome.patch b/net-proxy/paros/files/paros-3.2.1-unixhome.patch deleted file mode 100644 index d1170795d125..000000000000 --- a/net-proxy/paros/files/paros-3.2.1-unixhome.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -uNr paros.orig/src/org/parosproxy/paros/Constant.java paros/src/org/parosproxy/paros/Constant.java ---- paros.orig/src/org/parosproxy/paros/Constant.java 2005-05-06 23:30:32.000000000 +0200 -+++ paros/src/org/parosproxy/paros/Constant.java 2005-05-25 09:17:49.000000000 +0200 -@@ -21,6 +21,11 @@ - */ - package org.parosproxy.paros; - -+import org.apache.commons.logging.Log; -+import org.apache.commons.logging.LogFactory; -+import java.io.*; -+import java.nio.channels.*; -+ - /** - * - * To change the template for this generated type comment go to -@@ -31,13 +36,18 @@ - public static final String PROGRAM_VERSION = "3.2.1"; - public static final String PROGRAM_TITLE = PROGRAM_NAME + " " + PROGRAM_VERSION; - -- public static final String FILE_OPTIONS = "xml/options.xml"; -+ public static final String FILE_OPTIONS_DEFAULT = "xml/options.xml"; -+ public String FILE_OPTIONS = "options.xml"; - public static final String FOLDER_PLUGIN = "plugin"; - public static final String FOLDER_FILTER = "filter"; -- public static final String FOLDER_SESSION = "session"; -- public static final String DBNAME_TEMPLATE = "db/parosdb"; -- public static final String DBNAME_UNTITLED = FOLDER_SESSION + "/untitled"; -+ public static final String FOLDER_SESSION_DEFAULT = "session"; -+ public String FOLDER_SESSION = "session"; -+ public static final String DBNAME_TEMPLATE = "db/parosdb"; -+ public String DBNAME_UNTITLED = FOLDER_SESSION + "/untitled"; -+ public String ACCEPTED_LICENSE = "AcceptedLicense"; - -+ static private Constant instance = null; -+ - public static final int MAX_HOST_CONNECTION = 5; - public static final String USER_AGENT = PROGRAM_NAME + "/" + PROGRAM_VERSION; - -@@ -60,5 +70,57 @@ - return staticSP; - } - -- -+ public static void copyFile(File in, File out) throws Exception { -+ if (!in.exists()) -+ throw new IOException("Source file does not exist"); -+/* FileChannel sourceChannel = new FileInputStream(in).getChannel(); -+ FileChannel destinationChannel = new FileOutputStream(out).getChannel(); -+ sourceChannel.transferTo(0, in.length(), destinationChannel); -+ sourceChannel.close(); -+ destinationChannel.close();*/ -+ FileReader inf = new FileReader(in); -+ FileWriter outf = new FileWriter(out); -+ int c; -+ while ((c=inf.read()) != -1) -+ outf.write(c); -+ inf.close(); -+ outf.close(); -+ } -+ -+ public Constant() { -+ String userhome = System.getProperty("user.home") + System.getProperty("file.separator")+".paros"; -+ File f = new File(userhome); -+ userhome += System.getProperty("file.separator"); -+ FILE_OPTIONS=userhome+FILE_OPTIONS; -+ FOLDER_SESSION=userhome+FOLDER_SESSION; -+ DBNAME_UNTITLED=userhome+DBNAME_UNTITLED; -+ ACCEPTED_LICENSE=userhome+ACCEPTED_LICENSE; -+ try { -+ Log log = LogFactory.getLog(Constant.class); -+ if (!f.isDirectory()) { -+ log.info("Creating directory "+userhome); -+ f.mkdir(); -+ } -+ f=new File(FILE_OPTIONS); -+ if (!f.isFile()) { -+ log.info("Copying defaults from "+FILE_OPTIONS_DEFAULT+" to "+FILE_OPTIONS); -+ copyFile(new File(FILE_OPTIONS_DEFAULT),f); -+ } -+ f=new File(FOLDER_SESSION); -+ if (!f.isDirectory()) { -+ log.info("Creating directory "+FOLDER_SESSION); -+ f.mkdir(); -+ } -+ } catch (Exception e) { -+ System.err.println("Unable to initialize home directory! " + e.getMessage()); -+ e.printStackTrace(System.err); -+ System.exit(1); -+ } -+ } -+ -+ public static Constant getInstance() { -+ if (instance==null) -+ instance=new Constant(); -+ return instance; -+ } - } -diff -uNr paros.orig/src/org/parosproxy/paros/Paros.java paros/src/org/parosproxy/paros/Paros.java ---- paros.orig/src/org/parosproxy/paros/Paros.java 2005-05-06 00:05:48.000000000 +0200 -+++ paros/src/org/parosproxy/paros/Paros.java 2005-05-25 08:32:21.000000000 +0200 -@@ -169,7 +169,7 @@ - } - - private void showLicense() { -- if (!(new File("license/AcceptedLicense")).exists()){ -+ if (!(new File(Constant.getInstance().ACCEPTED_LICENSE)).exists()){ - - LicenseFrame license = new LicenseFrame(); - license.setVisible(true); -@@ -181,7 +181,7 @@ - } - - try{ -- FileWriter fo = new FileWriter("license/AcceptedLicense"); -+ FileWriter fo = new FileWriter(Constant.getInstance().ACCEPTED_LICENSE); - fo.close(); - }catch (IOException ie){ - JOptionPane.showMessageDialog(new JFrame(), "Unknown Error. Please report to the author."); -diff -uNr paros.orig/src/org/parosproxy/paros/control/Control.java paros/src/org/parosproxy/paros/control/Control.java ---- paros.orig/src/org/parosproxy/paros/control/Control.java 2005-04-08 00:17:28.000000000 +0200 -+++ paros/src/org/parosproxy/paros/control/Control.java 2005-05-25 08:31:01.000000000 +0200 -@@ -62,7 +62,7 @@ - loadExtension(); - - try { -- model.getOptionsParam().readAndParseFile(Constant.FILE_OPTIONS); -+ model.getOptionsParam().readAndParseFile(Constant.getInstance().FILE_OPTIONS); - } catch (Exception e) {} - - getProxy(); -diff -uNr paros.orig/src/org/parosproxy/paros/control/MenuToolsControl.java paros/src/org/parosproxy/paros/control/MenuToolsControl.java ---- paros.orig/src/org/parosproxy/paros/control/MenuToolsControl.java 2004-11-08 20:30:46.000000000 +0100 -+++ paros/src/org/parosproxy/paros/control/MenuToolsControl.java 2005-05-25 08:30:48.000000000 +0200 -@@ -59,7 +59,7 @@ - dialog.initParam(model.getOptionsParam()); - int result = dialog.showDialog(false); - if (result == JOptionPane.OK_OPTION) { -- model.getOptionsParam().saveFile(Constant.FILE_OPTIONS); -+ model.getOptionsParam().saveFile(Constant.getInstance().FILE_OPTIONS); - control.getProxy().stopServer(); - control.getProxy().startServer(); - } -diff -uNr paros.orig/src/org/parosproxy/paros/model/Model.java paros/src/org/parosproxy/paros/model/Model.java ---- paros.orig/src/org/parosproxy/paros/model/Model.java 2005-01-17 22:36:38.000000000 +0100 -+++ paros/src/org/parosproxy/paros/model/Model.java 2005-05-25 08:30:31.000000000 +0200 -@@ -40,7 +40,7 @@ - private static Model model = null; - - private static final String DBNAME_TEMPLATE = Constant.DBNAME_TEMPLATE; -- private static final String DBNAME_UNTITLED = Constant.DBNAME_UNTITLED; -+ private String DBNAME_UNTITLED = Constant.getInstance().DBNAME_UNTITLED; - private static int DBNAME_COPY = 1; - - private Session session = null; -@@ -93,7 +93,7 @@ - - createAndOpenUntitledDb(); - HistoryReference.setTableHistory(getDb().getTableHistory()); -- getOptionsParam().readAndParseFile(Constant.FILE_OPTIONS); -+ getOptionsParam().readAndParseFile(Constant.getInstance().FILE_OPTIONS); - } - - -diff -uNr paros.orig/src/org/parosproxy/paros/model/Session.java paros/src/org/parosproxy/paros/model/Session.java ---- paros.orig/src/org/parosproxy/paros/model/Session.java 2005-01-20 22:56:44.000000000 +0100 -+++ paros/src/org/parosproxy/paros/model/Session.java 2005-05-25 08:28:52.000000000 +0200 -@@ -313,7 +313,7 @@ - public String getSessionFolder() { - String result = ""; - if (fileName.equals("")) { -- result = Constant.FOLDER_SESSION; -+ result = Constant.getInstance().FOLDER_SESSION; - } else { - File file = new File(fileName); - result = file.getParent(); -diff -uNr paros.orig/src/xml/log4j.properties paros/src/xml/log4j.properties ---- paros.orig/src/xml/log4j.properties 2004-11-09 00:20:36.000000000 +0100 -+++ paros/src/xml/log4j.properties 2005-05-25 08:26:28.000000000 +0200 -@@ -1,8 +1,12 @@ --log4j.rootLogger=info, R -+log4j.rootLogger=info, stdout - -+log4j.appender.stdout=org.apache.log4j.ConsoleAppender -+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -+#log4j.appender.stdout.layout.ConversionPattern=%d [%-5t] %-5p %c{1} - %m%n -+log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c{1} - %m%n - - log4j.appender.R=org.apache.log4j.RollingFileAppender --log4j.appender.R.File=log/paros.message.txt -+log4j.appender.R.File=/tmp/paros.message.txt - - log4j.appender.R.MaxFileSize=2048KB - # Keep one backup file -@@ -13,4 +17,4 @@ - log4j.appender.R.layout.ConversionPattern=%d %-5p %c{1} - %m%n - - log4j.logger.org.parosproxy.paros=INFO --log4j.logger.org.apache.commons.httpclient=ERROR -\ No newline at end of file -+log4j.logger.org.apache.commons.httpclient=ERROR diff --git a/net-proxy/paros/files/paros-3.2.3-unixhome.patch b/net-proxy/paros/files/paros-3.2.3-unixhome.patch deleted file mode 100644 index 0305a6d7b0ea..000000000000 --- a/net-proxy/paros/files/paros-3.2.3-unixhome.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -Nru paros.orig/src/org/parosproxy/paros/Constant.java paros/src/org/parosproxy/paros/Constant.java ---- paros.orig/src/org/parosproxy/paros/Constant.java 2005-07-09 00:06:36.000000000 +0300 -+++ paros/src/org/parosproxy/paros/Constant.java 2005-07-30 11:13:23.000000000 +0300 -@@ -21,6 +21,11 @@ - */ - package org.parosproxy.paros; - -+import org.apache.commons.logging.Log; -+import org.apache.commons.logging.LogFactory; -+import java.io.*; -+import java.nio.channels.*; -+ - /** - * - * To change the template for this generated type comment go to -@@ -31,12 +36,17 @@ - public static final String PROGRAM_VERSION = "3.2.3"; - public static final String PROGRAM_TITLE = PROGRAM_NAME + " " + PROGRAM_VERSION; - -- public static final String FILE_CONFIG = "xml/config.xml"; -- public static final String FOLDER_PLUGIN = "plugin"; -- public static final String FOLDER_FILTER = "filter"; -- public static final String FOLDER_SESSION = "session"; -- public static final String DBNAME_TEMPLATE = "db/parosdb"; -- public static final String DBNAME_UNTITLED = FOLDER_SESSION + "/untitled"; -+ public static final String FILE_CONFIG_DEFAULT = "xml/config.xml"; -+ public String FILE_CONFIG = "config.xml"; -+ public static final String FOLDER_PLUGIN = "plugin"; -+ public static final String FOLDER_FILTER = "filter"; -+ public static final String FOLDER_SESSION_DEFAULT = "session"; -+ public String FOLDER_SESSION = "session"; -+ public static final String DBNAME_TEMPLATE = "db/parosdb"; -+ public String DBNAME_UNTITLED = FOLDER_SESSION + "/untitled"; -+ public String ACCEPTED_LICENSE = "AcceptedLicense"; -+ -+ static private Constant instance = null; - - public static final int MAX_HOST_CONNECTION = 5; - public static final String USER_AGENT = PROGRAM_NAME + "/" + PROGRAM_VERSION; -@@ -60,5 +70,57 @@ - return staticSP; - } - -- -+ public static void copyFile(File in, File out) throws Exception { -+ if (!in.exists()) -+ throw new IOException("Source file does not exist"); -+/* FileChannel sourceChannel = new FileInputStream(in).getChannel(); -+ FileChannel destinationChannel = new FileOutputStream(out).getChannel(); -+ sourceChannel.transferTo(0, in.length(), destinationChannel); -+ sourceChannel.close(); -+ destinationChannel.close();*/ -+ FileReader inf = new FileReader(in); -+ FileWriter outf = new FileWriter(out); -+ int c; -+ while ((c=inf.read()) != -1) -+ outf.write(c); -+ inf.close(); -+ outf.close(); -+ } -+ -+ public Constant() { -+ String userhome = System.getProperty("user.home") + System.getProperty("file.separator")+".paros"; -+ File f = new File(userhome); -+ userhome += System.getProperty("file.separator"); -+ FILE_CONFIG=userhome+FILE_CONFIG; -+ FOLDER_SESSION=userhome+FOLDER_SESSION; -+ DBNAME_UNTITLED=userhome+DBNAME_UNTITLED; -+ ACCEPTED_LICENSE=userhome+ACCEPTED_LICENSE; -+ try { -+ Log log = LogFactory.getLog(Constant.class); -+ if (!f.isDirectory()) { -+ log.info("Creating directory "+userhome); -+ f.mkdir(); -+ } -+ f=new File(FILE_CONFIG); -+ if (!f.isFile()) { -+ log.info("Copying defaults from "+FILE_CONFIG_DEFAULT+" to "+FILE_CONFIG); -+ copyFile(new File(FILE_CONFIG_DEFAULT),f); -+ } -+ f=new File(FOLDER_SESSION); -+ if (!f.isDirectory()) { -+ log.info("Creating directory "+FOLDER_SESSION); -+ f.mkdir(); -+ } -+ } catch (Exception e) { -+ System.err.println("Unable to initialize home directory! " + e.getMessage()); -+ e.printStackTrace(System.err); -+ System.exit(1); -+ } -+ } -+ -+ public static Constant getInstance() { -+ if (instance==null) -+ instance=new Constant(); -+ return instance; -+ } - } -diff -Nru paros.orig/src/org/parosproxy/paros/model/Model.java paros/src/org/parosproxy/paros/model/Model.java ---- paros.orig/src/org/parosproxy/paros/model/Model.java 2005-05-22 11:55:30.000000000 +0300 -+++ paros/src/org/parosproxy/paros/model/Model.java 2005-07-30 11:17:12.000000000 +0300 -@@ -39,7 +39,7 @@ - private static Model model = null; - - private static final String DBNAME_TEMPLATE = Constant.DBNAME_TEMPLATE; -- private static final String DBNAME_UNTITLED = Constant.DBNAME_UNTITLED; -+ private String DBNAME_UNTITLED = Constant.getInstance().DBNAME_UNTITLED; - private static int DBNAME_COPY = 1; - - private Session session = null; -@@ -96,7 +96,7 @@ - - createAndOpenUntitledDb(); - HistoryReference.setTableHistory(getDb().getTableHistory()); -- getOptionsParam().load(Constant.FILE_CONFIG); -+ getOptionsParam().load(Constant.getInstance().FILE_CONFIG); - } - - -diff -Nru paros.orig/src/org/parosproxy/paros/model/OptionsParam.java paros/src/org/parosproxy/paros/model/OptionsParam.java ---- paros.orig/src/org/parosproxy/paros/model/OptionsParam.java 2005-05-30 00:07:28.000000000 +0300 -+++ paros/src/org/parosproxy/paros/model/OptionsParam.java 2005-07-30 11:23:39.000000000 +0300 -@@ -140,7 +140,7 @@ - public FileConfiguration getConfig() { - if (config == null) { - try { -- config = new XMLConfiguration(Constant.FILE_CONFIG); -+ config = new XMLConfiguration(Constant.getInstance().FILE_CONFIG); - config.load(); - - } catch (ConfigurationException e) { -diff -Nru paros.orig/src/org/parosproxy/paros/model/Session.java paros/src/org/parosproxy/paros/model/Session.java ---- paros.orig/src/org/parosproxy/paros/model/Session.java 2005-05-30 23:37:38.000000000 +0300 -+++ paros/src/org/parosproxy/paros/model/Session.java 2005-07-30 11:03:11.000000000 +0300 -@@ -323,7 +323,7 @@ - public String getSessionFolder() { - String result = ""; - if (fileName.equals("")) { -- result = Constant.FOLDER_SESSION; -+ result = Constant.getInstance().FOLDER_SESSION; - } else { - File file = new File(fileName); - result = file.getParent(); -diff -Nru paros.orig/src/org/parosproxy/paros/Paros.java paros/src/org/parosproxy/paros/Paros.java ---- paros.orig/src/org/parosproxy/paros/Paros.java 2005-06-04 22:39:20.000000000 +0300 -+++ paros/src/org/parosproxy/paros/Paros.java 2005-07-30 11:03:11.000000000 +0300 -@@ -189,7 +189,7 @@ - } - - private void showLicense() { -- if (!(new File("license/AcceptedLicense")).exists()){ -+ if (!(new File(Constant.getInstance().ACCEPTED_LICENSE)).exists()){ - - LicenseFrame license = new LicenseFrame(); - license.setVisible(true); -@@ -201,7 +201,7 @@ - } - - try{ -- FileWriter fo = new FileWriter("license/AcceptedLicense"); -+ FileWriter fo = new FileWriter(Constant.getInstance().ACCEPTED_LICENSE); - fo.close(); - }catch (IOException ie){ - JOptionPane.showMessageDialog(new JFrame(), "Unknown Error. Please report to the author."); -diff -Nru paros.orig/src/xml/log4j.properties paros/src/xml/log4j.properties ---- paros.orig/src/xml/log4j.properties 2005-06-01 00:03:28.000000000 +0300 -+++ paros/src/xml/log4j.properties 2005-07-30 11:03:11.000000000 +0300 -@@ -1,8 +1,12 @@ --log4j.rootLogger=info, R -+log4j.rootLogger=info, stdout - -+log4j.appender.stdout=org.apache.log4j.ConsoleAppender -+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -+#log4j.appender.stdout.layout.ConversionPattern=%d [%-5t] %-5p %c{1} - %m%n -+log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c{1} - %m%n - - log4j.appender.R=org.apache.log4j.RollingFileAppender --log4j.appender.R.File=log/paros.message.txt -+log4j.appender.R.File=/tmp/paros.message.txt - - log4j.appender.R.MaxFileSize=4096KB - # Keep one backup file -@@ -13,4 +17,4 @@ - log4j.appender.R.layout.ConversionPattern=%d %-5p %c{1} - %m%n - - log4j.logger.org.parosproxy.paros=INFO --log4j.logger.org.apache.commons.httpclient=ERROR -\ No newline at end of file -+log4j.logger.org.apache.commons.httpclient=ERROR -- cgit v1.2.3-65-gdbad