Projects
home:zhangxiang:branches:Mega:23.03
netty
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 16
View file
_service:tar_scm:netty.spec
Changed
@@ -30,9 +30,9 @@ Patch0019: CVE-2021-43797-pre.patch Patch0020: CVE-2021-43797.patch Patch0021: fix-strip.patch -#%if "%toolchain" == "clang" -#Patch0022: fix-clang.patch -#%endif +%if "%toolchain" == "clang" +Patch0022: fix-clang.patch +%endif BuildRequires: maven-local mvn(ant-contrib:ant-contrib) BuildRequires: mvn(com.jcraft:jzlib) mvn(commons-logging:commons-logging) BuildRequires: mvn(kr.motd.maven:os-maven-plugin) mvn(log4j:log4j:1.2.17)
View file
_service:tar_scm:fix-clang.patch
Changed
@@ -1,51 +1,24 @@ -diff -ur netty-netty-4.1.13.Final/transport-native-epoll/pom.xml netty-netty-4.1.13.Final-copy/transport-native-epoll/pom.xml ---- transport-native-epoll/pom.xml 2017-07-06 19:23:51.000000000 +0800 -+++ transport-native-epoll/pom.xml 2023-05-30 22:33:37.760412920 +0800 -@@ -33,7 +33,7 @@ - <unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir> - <unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir> - <unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir> -- <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> -+ <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,-z, relro,-z,now,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> - <skipTests>true</skipTests> - </properties> - +diff -ur netty-netty-4.1.13.Final/transport-native-unix-common/Makefile netty-netty-4.1.13.Final-copy/transport-native-unix-common/Makefile +--- netty-netty-4.1.13.Final/transport-native-unix-common/Makefile 2017-07-06 11:23:51.000000000 +0000 ++++ netty-netty-4.1.13.Final-copy/transport-native-unix-common/Makefile 2023-05-31 09:32:07.181986593 +0000 +@@ -21,7 +21,7 @@ + # LIB_DIR - where the static library will be built in + # OBJ_DIR - where the obj files will be built in (defaults to LIB_DIR) + # LIB_NAME - the name of the native library +- ++CC ?=cc + SRC_DIR = src/main/c + JNI_INCLUDE_DIR = $(JAVA_HOME)/include + JNI_INCLUDES = -I$(JNI_INCLUDE_DIR) -I$(JNI_INCLUDE_DIR)/$(JNI_PLATFORM) diff -ur netty-netty-4.1.13.Final/transport-native-unix-common/pom.xml netty-netty-4.1.13.Final-copy/transport-native-unix-common/pom.xml ---- transport-native-unix-common/pom.xml 2017-07-06 19:23:51.000000000 +0800 -+++ transport-native-unix-common/pom.xml 2023-05-30 22:17:28.825930398 +0800 -@@ -100,7 +100,7 @@ - <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" /> -- <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> -+ <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--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 - explicitly set the target platform. Otherwise we may get fatal link errors due to weakly linked -@@ -171,7 +171,7 @@ - <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" /> -- <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> -+ <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" /> - <env key="LIB_NAME" value="${nativeLibName}" /> - </exec> - </target> -@@ -241,7 +241,7 @@ - <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" /> -- <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> -+ <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" /> - <env key="LIB_NAME" value="${nativeLibName}" /> - </exec> - </target> -@@ -311,7 +311,7 @@ - <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" /> -- <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> -+ <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" /> - <env key="LIB_NAME" value="${nativeLibName}" /> - </exec> - </target> +--- netty-netty-4.1.13.Final/transport-native-unix-common/pom.xml 2017-07-06 11:23:51.000000000 +0000 ++++ netty-netty-4.1.13.Final-copy/transport-native-unix-common/pom.xml 2023-05-31 11:01:27.545622740 +0000 +@@ -31,7 +31,7 @@ + + <properties> + <exe.make>make</exe.make> +- <exe.compiler>gcc</exe.compiler> ++ <exe.compiler>clang</exe.compiler> + <exe.archiver>ar</exe.archiver> + <nativeLibName>libnetty-unix-common</nativeLibName> + <nativeIncludeDir>${project.basedir}/src/main/c</nativeIncludeDir>
View file
_service:tar_scm:fix-strip.patch
Changed
@@ -6,7 +6,7 @@ <unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir> <unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir> - <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> -+ <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,-z, relro,-z,now,--no-as-needed -lrt -Wl,--whole-archive -Wl,-s -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> ++ <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -Wl,-s -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> <skipTests>true</skipTests> </properties> @@ -25,6 +25,6 @@ <regex>^((?!CFLAGS=).)*$</regex> - <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -I${unix.common.include.unpacked.dir}</replacement> + <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -Wl,-s -I${unix.common.include.unpacked.dir}</replacement> - <failIfNoMatch>false</failIfNoMatch> + <failIfNoMa tch>false</failIfNoMatch> </configuration> </execution>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2