Skip to content
Snippets Groups Projects
Unverified Commit 43830a7d authored by Ritesh Raj Sarraf's avatar Ritesh Raj Sarraf
Browse files

Merge remote-tracking branch 'origin/apertis/v2021-security' into...

Merge remote-tracking branch 'origin/apertis/v2021-security' into proposed-updates/debian/buster-security/bef9ec5c

* origin/apertis/v2021-security:
  Release netty version 1:4.1.33-1+deb10u1co1
  debian/apertis/component: Set to development
  Apertis package update 4.1.33-1co1
  Import Debian changes 1:4.1.33-1co1
parents df95c8e5 bef9ec5c
No related branches found
Tags debian/1%4.1.48-7
4 merge requests!11Merge changes from apertis/v2021-security into apertis/v2021,!10Merge changes from apertis/v2020-security into apertis/v2020,!9Release netty version 1:4.1.33-1+deb10u2+apertis1,!7Update from debian/buster-security for apertis/v2021-security
development
include:
- project: 'infrastructure/ci-package-builder'
file: '/ci-package-builder.yml'
......@@ -45,6 +45,13 @@ netty (1:4.1.33-1+deb10u2) buster-security; urgency=high
-- Markus Koschany <apo@debian.org> Thu, 01 Apr 2021 23:20:46 +0200
netty (1:4.1.33-1+deb10u1co1) apertis; urgency=medium
* Sync changes from Debian Buster. Remaining Apertis specific changes
+ Build native parts without Werror as that can cause build failures
-- Ritesh Raj Sarraf <ritesh.sarraf@collabora.com> Fri, 29 May 2020 19:18:11 +0530
netty (1:4.1.33-1+deb10u1) buster-security; urgency=high
* Non-maintainer upload by the Security Team.
......@@ -53,6 +60,12 @@ netty (1:4.1.33-1+deb10u1) buster-security; urgency=high
-- Salvatore Bonaccorso <carnil@debian.org> Thu, 02 Jan 2020 23:19:52 +0100
netty (1:4.1.33-1co1) apertis; urgency=medium
* Build native parts without Werror as that can cause build failures
-- Sjoerd Simons <sjoerd.simons@collabora.co.uk> Thu, 28 Feb 2019 11:08:13 +0100
netty (1:4.1.33-1) unstable; urgency=medium
* Team upload.
......
--- 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>
......@@ -10,6 +10,7 @@
11-ignore-protobuf-nano.patch
13-ignore-conscrypt.patch
14-Correctly-handle-whitespaces-in-HTTP-header-names-as.patch
disable-Werror.patch
CVE-2019-20444.patch
CVE-2019-20445_1.patch
CVE-2019-20445_2.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment