[netty] 03/05: refresh patches for fuzz

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository netty.

commit ac333b0154753ab20b0ba4adbbd683cd9c3fb52b
Author: tony mancill <tmancill at debian.org>
Date:   Sat Jun 18 14:40:55 2016 -0700

    refresh patches for fuzz
---
 debian/patches/01-ignore-npn.patch                       | 8 ++++----
 debian/patches/02-ignore-enforcer-rules.patch            | 2 +-
 debian/patches/04-netty-all-light.patch                  | 4 ++--
 debian/patches/05-reproducible-versions-properties.patch | 2 +-
 debian/patches/06-remove-tcnative-classifier.patch       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/01-ignore-npn.patch b/debian/patches/01-ignore-npn.patch
index ff5a8fd..565d81c 100644
--- a/debian/patches/01-ignore-npn.patch
+++ b/debian/patches/01-ignore-npn.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -697,6 +697,7 @@
+@@ -719,6 +719,7 @@
          </configuration>
        </plugin>
        <!-- Download the npn-boot.jar in advance to add it to the boot classpath. -->
@@ -11,7 +11,7 @@ Forwarded: not-needed
        <plugin>
          <artifactId>maven-dependency-plugin</artifactId>
          <executions>
-@@ -714,6 +715,7 @@
+@@ -736,6 +737,7 @@
            </execution>
          </executions>
        </plugin>
@@ -45,7 +45,7 @@ Forwarded: not-needed
  
 --- a/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
 +++ b/handler/src/main/java/io/netty/handler/ssl/JdkSslContext.java
-@@ -228,6 +228,7 @@
+@@ -268,6 +268,7 @@
          switch(config.protocol()) {
          case NONE:
              return JdkDefaultApplicationProtocolNegotiator.INSTANCE;
@@ -53,7 +53,7 @@ Forwarded: not-needed
          case ALPN:
              if (isServer) {
                  switch(config.selectorFailureBehavior()) {
-@@ -272,6 +273,7 @@
+@@ -312,6 +313,7 @@
                      .append(config.selectorFailureBehavior()).append(" failure behavior").toString());
                  }
              }
diff --git a/debian/patches/02-ignore-enforcer-rules.patch b/debian/patches/02-ignore-enforcer-rules.patch
index c614e60..2b16070 100644
--- a/debian/patches/02-ignore-enforcer-rules.patch
+++ b/debian/patches/02-ignore-enforcer-rules.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -965,18 +965,6 @@
+@@ -991,18 +991,6 @@
  
      <pluginManagement>
        <plugins>
diff --git a/debian/patches/04-netty-all-light.patch b/debian/patches/04-netty-all-light.patch
index b28c25f..2b5d058 100644
--- a/debian/patches/04-netty-all-light.patch
+++ b/debian/patches/04-netty-all-light.patch
@@ -89,7 +89,7 @@ Forwarded: not-needed
      </dependency>
  
      <!-- Add optional dependencies explicitly to avoid Javadoc warnings and errors. -->
-@@ -289,7 +277,7 @@
+@@ -291,7 +279,7 @@
            </execution>
            <execution>
              <id>merge-version-properties</id>
@@ -98,7 +98,7 @@ Forwarded: not-needed
              <goals>
                <goal>run</goal>
              </goals>
-@@ -317,7 +305,7 @@
+@@ -319,7 +307,7 @@
            <!-- Clean everything once finished so that IDE doesn't find the unpacked files. -->
            <execution>
              <id>clean-source-directory</id>
diff --git a/debian/patches/05-reproducible-versions-properties.patch b/debian/patches/05-reproducible-versions-properties.patch
index a708b50..6f87ca3 100644
--- a/debian/patches/05-reproducible-versions-properties.patch
+++ b/debian/patches/05-reproducible-versions-properties.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -927,11 +927,11 @@
+@@ -953,11 +953,11 @@
  
                  <propertyfile file="${versionPropFile}" comment="Generated by netty-parent/pom.xml">
                    <entry key="${project.artifactId}.version" value="${project.version}" />
diff --git a/debian/patches/06-remove-tcnative-classifier.patch b/debian/patches/06-remove-tcnative-classifier.patch
index 7555235..67c4a24 100644
--- a/debian/patches/06-remove-tcnative-classifier.patch
+++ b/debian/patches/06-remove-tcnative-classifier.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -295,7 +295,6 @@
+@@ -297,7 +297,6 @@
          <groupId>${project.groupId}</groupId>
          <artifactId>${tcnative.artifactId}</artifactId>
          <version>${tcnative.version}</version>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git