Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vpa1977/netty
  • olek/netty
  • sudip/netty
  • java-team/netty
4 results
Show changes
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ b07dfe15
netty (1:4.1.33-3) unstable; urgency=medium
* Team upload.
* Apply patch for FTBFS on 32-bit architectures. (Closes: #923455)
Thank you to Sjoerd Simons for the patch.
* Set "Rules-Requires-Root: no" in debian/control
* Specify debhelper compat 12 via debhelper-compat dependency
* Bump Standards-Version to 4.4.1
-- tony mancill <tmancill@debian.org> Wed, 08 Jan 2020 20:40:19 -0800
netty (1:4.1.33-2) unstable; urgency=high
* Team upload.
......
debian/compat deleted 100644 → 0
View file @ 7d38f644
11
debian/control
View file @ b07dfe15
......@@ -9,7 +9,7 @@ Uploaders:
Build-Depends:
ant,
ant-contrib (>= 1.0~b3+svn177-8~),
debhelper (>= 11~),
debhelper-compat (= 12),
default-jdk,
groovy,
libbcpkix-java,
......@@ -29,10 +29,11 @@ Build-Depends:
libprotobuf-java,
libxz-java,
maven-debian-helper (>= 1.5)
Standards-Version: 4.3.0
Standards-Version: 4.4.1
Vcs-Git: https://salsa.debian.org/java-team/netty.git
Vcs-Browser: https://salsa.debian.org/java-team/netty
Homepage: http://netty.io/
Rules-Requires-Root: no
Package: libnetty-java
Architecture: all
......
debian/patches/15-disable-Werror.patch 0 → 100644
View file @ b07dfe15
Description: Build native parts without Werror as that can cause build failures
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923455
--- a/transport-native-unix-common/pom.xml
+++ b/transport-native-unix-common/pom.xml
@@ -101,7 +101,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
<!-- support for __attribute__((weak_import)) by the linker was added in 10.2 so ensure we
@@ -172,7 +172,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
@@ -242,7 +242,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
@@ -312,7 +312,7 @@
<env key="LIB_DIR" value="${nativeLibOnlyDir}" />
<env key="OBJ_DIR" value="${nativeObjsOnlyDir}" />
<env key="JNI_PLATFORM" value="${jni.platform}" />
- <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
<env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
<env key="LIB_NAME" value="${nativeLibName}" />
</exec>
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -265,7 +265,7 @@
<value>${linux.sendmmsg.support}${glibc.sendmmsg.support}</value>
<!-- If glibc and linux kernel are both not sufficient...then define the CFLAGS -->
<regex>.*IO_NETTY_SENDMSSG_NOT_FOUND.*</regex>
- <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
+ <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
@@ -281,7 +281,7 @@
<value>${jni.compiler.args.cflags}</value>
<!-- If glibc and linux kernel are both not sufficient...then define the CFLAGS -->
<regex>^((?!CFLAGS=).)*$</regex>
- <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
+ <replacement>CFLAGS=-O3 -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
debian/patches/series
View file @ b07dfe15
......@@ -10,3 +10,4 @@
11-ignore-protobuf-nano.patch
13-ignore-conscrypt.patch
14-Correctly-handle-whitespaces-in-HTTP-header-names-as.patch
15-disable-Werror.patch