hello there,

following Mark's suggestion, i changed the licence of the jarsigner 
sources to be GPL.

here is the patch --already committed-- and the ChangeLog entry:

2006-04-02  Raif S. Naffah  <[EMAIL PROTECTED]>

        * tools/gnu/classpath/tools/jarsigner/HashUtils.java: Use GPL.
        * tools/gnu/classpath/tools/jarsigner/SFHelper.java: Likewise.
        * tools/gnu/classpath/tools/jarsigner/JarVerifier.java: Likewise.
        * tools/gnu/classpath/tools/jarsigner/JarSigner.java: Likewise.
        * tools/gnu/classpath/tools/jarsigner/Main.java: Likewise.
        Re-organised imports.


cheers;
rsn
Index: HashUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java,v
retrieving revision 1.1
diff -u -r1.1 HashUtils.java
--- HashUtils.java	25 Mar 2006 12:38:20 -0000	1.1
+++ HashUtils.java	2 Apr 2006 00:58:14 -0000
@@ -16,24 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */


 package gnu.classpath.tools.jarsigner;
Index: JarSigner.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,v
retrieving revision 1.1
diff -u -r1.1 JarSigner.java
--- JarSigner.java	25 Mar 2006 12:38:20 -0000	1.1
+++ JarSigner.java	2 Apr 2006 00:58:35 -0000
@@ -16,24 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */


 package gnu.classpath.tools.jarsigner;
Index: JarVerifier.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java,v
retrieving revision 1.1
diff -u -r1.1 JarVerifier.java
--- JarVerifier.java	25 Mar 2006 12:38:20 -0000	1.1
+++ JarVerifier.java	2 Apr 2006 00:59:14 -0000
@@ -16,24 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */


 package gnu.classpath.tools.jarsigner;
Index: Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/Main.java,v
retrieving revision 1.4
diff -u -r1.4 Main.java
--- Main.java	31 Mar 2006 13:41:48 -0000	1.4
+++ Main.java	2 Apr 2006 00:59:52 -0000
@@ -16,28 +16,17 @@
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */


 package gnu.classpath.tools.jarsigner;

+import gnu.classpath.SystemProperties;
+import gnu.classpath.tools.HelpPrinter;
+import gnu.java.security.OID;
+import gnu.java.security.Registry;
+import gnu.javax.security.auth.callback.ConsoleCallbackHandler;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -62,12 +51,6 @@
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;

-import gnu.classpath.SystemProperties;
-import gnu.classpath.tools.HelpPrinter;
-import gnu.java.security.OID;
-import gnu.java.security.Registry;
-import gnu.javax.security.auth.callback.ConsoleCallbackHandler;
-
 /**
  * The GNU Classpath implementation of the <i>jarsigner</i> tool.
  * <p>
Index: SFHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java,v
retrieving revision 1.2
diff -u -r1.2 SFHelper.java
--- SFHelper.java	31 Mar 2006 12:24:09 -0000	1.2
+++ SFHelper.java	2 Apr 2006 01:00:29 -0000
@@ -16,24 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */


 package gnu.classpath.tools.jarsigner;

Attachment: pgpBRFGjgFxhi.pgp
Description: PGP signature

Reply via email to