[Frugalware-git] openjava: gnuinetlib-1.1.2-4-x86_64

[Marius Cirsta]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=2d7986429b19f527a08c42d19eca08875df6c0a3

commit 2d7986429b19f527a08c42d19eca08875df6c0a3
Author: Marius Cirsta <mcirsta at frugalware.org>
Date:   Wed Jun 27 20:37:38 2012 +0000

gnuinetlib-1.1.2-4-x86_64

* patch to allow gnumail to build

diff --git a/source/devel-extra/gnuinetlib/FrugalBuild b/source/devel-extra/gnuinetlib/FrugalBuild
index fdc9484..4d5c76b 100644
--- a/source/devel-extra/gnuinetlib/FrugalBuild
+++ b/source/devel-extra/gnuinetlib/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gnuinetlib
pkgver=1.1.2
-pkgrel=3
+pkgrel=4
pkgdesc="Network extensions library for GNU classpath and classpathx"
url="http://www.gnu.org/software/classpath/"
Finclude openjava
@@ -12,11 +12,13 @@ archs=('i686' 'x86_64')
replaces=('inetlib')
_F_archive_name="inetlib"
up2date="Flasttar ftp://ftp.gnu.org/gnu/classpath/"
-source=(ftp://ftp.gnu.org/gnu/classpath/inetlib-$pkgver.tar.gz)
-signatures=($source.sig)
+source=(ftp://ftp.gnu.org/gnu/classpath/inetlib-$pkgver.tar.gz \
+	make-logger-static-again.patch)
+signatures=($source.sig '')

build()
{
+	Fpatchall
Fmake
Fjar inetlib.jar
}
diff --git a/source/devel-extra/gnuinetlib/make-logger-static-again.patch b/source/devel-extra/gnuinetlib/make-logger-static-again.patch
new file mode 100644
index 0000000..f37a74f
--- /dev/null
+++ b/source/devel-extra/gnuinetlib/make-logger-static-again.patch
@@ -0,0 +1,65 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 25 Sep 2011 18:36:30 +0200
+Subject: make logger static again
+
+Revert some changes in upstream version 1.1.2 that breaks other packages.
+---
+ source/gnu/inet/imap/IMAPConnection.java |    2 +-
+ source/gnu/inet/nntp/NNTPConnection.java |    2 +-
+ source/gnu/inet/pop3/POP3Connection.java |    2 +-
+ source/gnu/inet/smtp/SMTPConnection.java |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source/gnu/inet/imap/IMAPConnection.java b/source/gnu/inet/imap/IMAPConnection.java
+index 039644a..42745db 100644
+--- a/source/gnu/inet/imap/IMAPConnection.java
++++ b/source/gnu/inet/imap/IMAPConnection.java
+@@ -120,7 +120,7 @@ public class IMAPConnection
+   /**
+    * The logger used for IMAP protocol traces.
+    */
+-  public final Logger logger = Logger.getLogger("gnu.inet.imap");
++  public static final Logger logger = Logger.getLogger("gnu.inet.imap");
+
+   /**
+    * The socket used for communication with the server.
+diff --git a/source/gnu/inet/nntp/NNTPConnection.java b/source/gnu/inet/nntp/NNTPConnection.java
+index 26898d6..172a5cf 100644
+--- a/source/gnu/inet/nntp/NNTPConnection.java
++++ b/source/gnu/inet/nntp/NNTPConnection.java
+@@ -105,7 +105,7 @@ public class NNTPConnection
+   /**
+    * The logger used for NNTP protocol traces.
+    */
+-  public final Logger logger = Logger.getLogger("gnu.inet.nntp");
++  public static final Logger logger = Logger.getLogger("gnu.inet.nntp");
+
+   /**
+    * The hostname of the host we are connected to.
+diff --git a/source/gnu/inet/pop3/POP3Connection.java b/source/gnu/inet/pop3/POP3Connection.java
+index 3bdaa48..859083c 100644
+--- a/source/gnu/inet/pop3/POP3Connection.java
++++ b/source/gnu/inet/pop3/POP3Connection.java
+@@ -136,7 +136,7 @@ public class POP3Connection
+   /**
+    * The logger used for POP3 protocol traces.
+    */
+-  public final Logger logger = Logger.getLogger("gnu.inet.pop3");
++  public static final Logger logger = Logger.getLogger("gnu.inet.pop3");
+
+   /**
+    * The socket used to communicate with the server.
+diff --git a/source/gnu/inet/smtp/SMTPConnection.java b/source/gnu/inet/smtp/SMTPConnection.java
+index c625f28..f97262d 100644
+--- a/source/gnu/inet/smtp/SMTPConnection.java
++++ b/source/gnu/inet/smtp/SMTPConnection.java
+@@ -124,7 +124,7 @@ public class SMTPConnection
+   /**
+    * The logger used for SMTP protocol traces.
+    */
+-  public final Logger logger = Logger.getLogger("gnu.inet.smtp");
++  public static final Logger logger = Logger.getLogger("gnu.inet.smtp");
+
+   /**
+    * The underlying socket used for communicating with the server.
+--