x86; version bump

(Portage version: 2.0.51.22-r2)

6 files changed, 248 insertions, 14 deletions

diff --git a/net-proxy/paros/ChangeLog b/net-proxy/paros/ChangeLog
index 96dc4284459f..7fbdfee1b680 100644
--- a/net-proxy/paros/ChangeLog
+++ b/net-proxy/paros/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/paros
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/ChangeLog,v 1.4 2005/05/26 05:16:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/ChangeLog,v 1.5 2005/07/30 09:00:15 mrness Exp $
+
+*paros-3.2.3 (30 Jul 2005)
+
+  30 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/paros-3.2.3-unixhome.patch, paros-3.2.1.ebuild,
+  +paros-3.2.3.ebuild:
+  Stable on x86. Version bump.
 
 *paros-3.2.1 (26 May 2005)
 
diff --git a/net-proxy/paros/Manifest b/net-proxy/paros/Manifest
index 29a7a6b3f0e5..cd52acceac65 100644
--- a/net-proxy/paros/Manifest
+++ b/net-proxy/paros/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa23c68fe40765ba6eee5fe1d3323b05 paros-3.2.1.ebuild 957
+MD5 c07538484a862423bd89e772384f6799 paros-3.2.1.ebuild 956
+MD5 aa23c68fe40765ba6eee5fe1d3323b05 paros-3.2.3.ebuild 957
 MD5 de85e8e039a568872522fb31405a807e paros-3.2.0.ebuild 726
 MD5 4dca25f592e075df0f454a45c0f3a0e0 ChangeLog 904
 MD5 4b03e120ede9dfedec0594e35156b38c metadata.xml 256
 MD5 d94a73453cb13809517ded8065abbaf7 files/paros-3.2.1-unixhome.patch 8462
 MD5 63433745c47ead240f2be10aa5d8954d files/digest-paros-3.2.0 66
 MD5 a721e44c8406402cbb63892f10156ab3 files/digest-paros-3.2.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFClVvUjiC39V7gKu0RAnyNAJ9U437xXJMZeTg7Qq3EG7YO9/HctACfZAlU
-nsh18vMmrc9A4IY1/oYkJqY=
-=kiXz
------END PGP SIGNATURE-----
+MD5 b918a1e38c640c3d1cf3b4ef31de1586 files/digest-paros-3.2.3 65
+MD5 6de4de62cb3364aa7daed320ff305fbd files/paros-3.2.3-unixhome.patch 7891
diff --git a/net-proxy/paros/files/digest-paros-3.2.3 b/net-proxy/paros/files/digest-paros-3.2.3
new file mode 100644
index 000000000000..7e0e92608f23
--- /dev/null
+++ b/net-proxy/paros/files/digest-paros-3.2.3
@@ -0,0 +1 @@
+MD5 d54b98f6866f2753706ab9b7db0befa3 paros-3.2.3-src.zip 4428948
diff --git a/net-proxy/paros/files/paros-3.2.3-unixhome.patch b/net-proxy/paros/files/paros-3.2.3-unixhome.patch
new file mode 100644
index 000000000000..0305a6d7b0ea
--- /dev/null
+++ b/net-proxy/paros/files/paros-3.2.3-unixhome.patch
@@ -0,0 +1,189 @@
+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

diff --git a/net-proxy/paros/paros-3.2.1.ebuild b/net-proxy/paros/paros-3.2.1.ebuild
index 62b108dc1ccc..e790f544a30f 100644
--- a/net-proxy/paros/paros-3.2.1.ebuild
+++ b/net-proxy/paros/paros-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/paros-3.2.1.ebuild,v 1.1 2005/05/26 05:16:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/paros-3.2.1.ebuild,v 1.2 2005/07/30 09:00:15 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/net-proxy/paros/paros-3.2.3.ebuild b/net-proxy/paros/paros-3.2.3.ebuild
new file mode 100644
index 000000000000..48bfbaccd0d9
--- /dev/null
+++ b/net-proxy/paros/paros-3.2.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/paros/paros-3.2.3.ebuild,v 1.1 2005/07/30 09:00:15 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="HTTP/HTTPS proxy for evaluate security of web applications"
+HOMEPAGE="http://www.parosproxy.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.4.2
+	dev-java/ant"
+RDEPEND=">=virtual/jre-1.4.2"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-unixhome.patch
+}
+
+src_compile() {
+	cd ${S}/build
+	ant dist || die "ant failed"
+}
+
+src_install() {
+	sed -i -e '1i#!/bin/sh' -e "1icd /usr/share/${PN}" build/${PN}/startserver.sh
+	newbin build/${PN}/startserver.sh ${PN}
+	rm build/${PN}/startserver.*
+
+	insinto /usr/share
+	doins -r build/${PN}
+
+	dodoc src/doc/{*.txt,*.rtf}
+}