[Git][java-team/apache-directory-server][master] 5 commits: Fix FTBFS with mina2 2.1.4.

Markus Koschany gitlab at salsa.debian.org
Sun Oct 18 20:57:45 BST 2020 


Markus Koschany pushed to branch master at Debian Java Maintainers / apache-directory-server


Commits:
abf9d55f by Markus Koschany at 2020-10-18T21:35:42+02:00
Fix FTBFS with mina2 2.1.4.

- - - - -
81ad317c by Markus Koschany at 2020-10-18T21:40:51+02:00
Switch to debhelper-compat = 13.

- - - - -
2a1f5ba3 by Markus Koschany at 2020-10-18T21:41:06+02:00
Declare compliance with Debian Policy 4.5.0.

- - - - -
7b2f0d24 by Markus Koschany at 2020-10-18T21:41:43+02:00
Update changelog

- - - - -
2f81d5b5 by Markus Koschany at 2020-10-18T21:52:41+02:00
Fix Lintian warning skip-systemd-native-flag-missing-pre-depends

and add ${misc:PreDepends} to debian/control.

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/mina2-event-method.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+apache-directory-server (2.0.0~M24-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with mina2 2.1.4.
+  * Switch to debhelper-compat = 13.
+  * Declare compliance with Debian Policy 4.5.0.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 18 Oct 2020 21:41:12 +0200
+
 apache-directory-server (2.0.0~M24-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>,
 Build-Depends:
  ant,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  junit4,
  libapache-directory-api-java (>= 1.0.0),
@@ -24,7 +24,7 @@ Build-Depends:
  libplexus-utils2-java (>= 2.x),
  libslf4j-java,
  maven-debian-helper (>= 2.0),
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/apache-directory-server.git
 Vcs-Browser: https://salsa.debian.org/java-team/apache-directory-server
 Homepage: http://directory.apache.org
@@ -84,7 +84,9 @@ Depends:
  adduser,
  default-jre-headless | java7-runtime-headless,
  libapacheds-java (= ${source:Version}),
- ${misc:Depends},
+ ${misc:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends}
 Description: Apache Directory Server
  ApacheDS is an embbedable directory server entirely written in Java, which
  has been certified LDAPv3 compatible by the Open Group. Besides LDAP it


=====================================
debian/patches/mina2-event-method.patch
=====================================
@@ -0,0 +1,130 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 18 Oct 2020 15:14:40 +0200
+Subject: mina2 event method
+
+Fix FTBFS with mina2 2.1.4.
+
+Forwarded: no
+---
+ .../server/dhcp/protocol/DhcpProtocolHandler.java         |  5 +++++
+ .../directory/server/dns/protocol/DnsProtocolHandler.java |  7 ++++++-
+ .../changepwd/protocol/ChangePasswordProtocolHandler.java |  5 +++++
+ .../server/kerberos/protocol/KerberosProtocolHandler.java |  5 +++++
+ .../apache/directory/server/ldap/LdapProtocolHandler.java | 15 ---------------
+ 5 files changed, 21 insertions(+), 16 deletions(-)
+
+diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
+index 3457783..6ffbf86 100644
+--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
++++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
+@@ -31,6 +31,7 @@ import org.apache.mina.core.service.IoHandler;
+ import org.apache.mina.core.session.IdleStatus;
+ import org.apache.mina.core.session.IoSession;
+ import org.apache.mina.filter.codec.ProtocolCodecFilter;
++import org.apache.mina.filter.FilterEvent;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -220,4 +221,8 @@ public class DhcpProtocolHandler implements IoHandler
+     public void inputClosed( IoSession session )
+     {
+     }
++
++    @Override
++    public void event(IoSession session, FilterEvent event) {
++    }
+ }
+diff --git a/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java b/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
+index 3e764c8..26b6eb6 100644
+--- a/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
++++ b/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
+@@ -38,6 +38,7 @@ import org.apache.mina.core.service.IoHandler;
+ import org.apache.mina.core.session.IdleStatus;
+ import org.apache.mina.core.session.IoSession;
+ import org.apache.mina.filter.codec.ProtocolCodecFilter;
++import org.apache.mina.filter.FilterEvent;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -169,8 +170,12 @@ public class DnsProtocolHandler implements IoHandler
+         return ( this.contextKey );
+     }
+ 
+-    
++
+     public void inputClosed( IoSession session )
+     {
+     }
++
++    @Override
++    public void event(IoSession session, FilterEvent event) {
++    }
+ }
+diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
+index 661d8c6..d680c25 100644
+--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
++++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
+@@ -46,6 +46,7 @@ import org.apache.mina.core.service.IoHandler;
+ import org.apache.mina.core.session.IdleStatus;
+ import org.apache.mina.core.session.IoSession;
+ import org.apache.mina.filter.codec.ProtocolCodecFilter;
++import org.apache.mina.filter.FilterEvent;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -228,4 +229,8 @@ public class ChangePasswordProtocolHandler implements IoHandler
+     public void inputClosed( IoSession session )
+     {
+     }
++
++    @Override
++    public void event(IoSession session, FilterEvent event) {
++    }
+ }
+diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
+index d0c01fc..3cd350b 100644
+--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
++++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
+@@ -43,6 +43,7 @@ import org.apache.directory.shared.kerberos.messages.KrbError;
+ import org.apache.mina.core.service.IoHandler;
+ import org.apache.mina.core.session.IdleStatus;
+ import org.apache.mina.core.session.IoSession;
++import org.apache.mina.filter.FilterEvent;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -341,4 +342,8 @@ public class KerberosProtocolHandler implements IoHandler
+     public void inputClosed( IoSession session )
+     {
+     }
++
++     @Override
++     public void event(IoSession session, FilterEvent event) {
++     }
+ }
+diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
+index 6b815bd..5a0e928 100644
+--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
++++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
+@@ -179,21 +179,6 @@ class LdapProtocolHandler extends DemuxingIoHandler
+         // and degrade authentication level to 'anonymous' as specified
+         // in the RFC, and this is no threat.
+ 
+-        if ( message == SslFilter.SESSION_SECURED )
+-        {
+-            ExtendedRequest req =
+-                LdapApiServiceFactory.getSingleton().newExtendedRequest( "1.3.6.1.4.1.1466.20037",
+-                    "SECURED".getBytes( "ISO-8859-1" ) );
+-            message = req;
+-        }
+-        else if ( message == SslFilter.SESSION_UNSECURED )
+-        {
+-            ExtendedRequest req =
+-                LdapApiServiceFactory.getSingleton().newExtendedRequest( "1.3.6.1.4.1.1466.20037",
+-                    "SECURED".getBytes( "ISO-8859-1" ) );
+-            message = req;
+-        }
+-
+         if ( ( ( Request ) message ).getControls().size() > 0
+             && message instanceof ResultResponseRequest )
+         {


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 01-jar-packaging.patch
+mina2-event-method.patch



View it on GitLab: https://salsa.debian.org/java-team/apache-directory-server/-/compare/56b60467ccb5dfd0ddceba61802417f8f2d87232...2f81d5b5083cd6c1285fa39532d075537ab21012

-- 
View it on GitLab: https://salsa.debian.org/java-team/apache-directory-server/-/compare/56b60467ccb5dfd0ddceba61802417f8f2d87232...2f81d5b5083cd6c1285fa39532d075537ab21012
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201018/eb7c8c91/attachment.html>

More information about the pkg-java-commits mailing list