commit 4c410d2ce8ac4ffb7b15cc73c66cffdeee86e0de
Author: Elan Ruusamäe <[email protected]>
Date: Sat Feb 23 13:00:30 2019 +0200
up to 5.36
file-pie-so.patch | 12 ------------
file.spec | 4 +---
2 files changed, 1 insertion(+), 15 deletions(-)
---
diff --git a/file.spec b/file.spec
index ad9f5c5..0e2a9e5 100644
--- a/file.spec
+++ b/file.spec
@@ -29,7 +29,7 @@ Summary(uk.UTF-8): Утиліта для визначення типів фай
Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
-Version: 5.35
+Version: 5.36
Release: 1
License: distributable
Group: Applications/File
@@ -44,7 +44,6 @@ Patch0: %{name}-selinux.patch
Patch1: searchpath.patch
Patch2: automake.patch
Patch4: name-use-count.patch
-Patch5: %{name}-pie-so.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -274,7 +273,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
%patch1 -p1
%patch2 -p1
%patch4 -p1
-%patch5 -p1
%if "%{cc_version}" < "3.4"
%{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/file-pie-so.patch b/file-pie-so.patch
deleted file mode 100644
index 62cf8c3..0000000
--- a/file-pie-so.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruNp file-5.34.orig/src/readelf.c file-5.34/src/readelf.c
---- file-5.34.orig/src/readelf.c 2018-07-09 16:24:36.000000000 +0200
-+++ file-5.34/src/readelf.c 2018-09-13 23:26:17.906332501 +0200
-@@ -1062,7 +1062,7 @@ dodynamic(struct magic_set *ms, void *vb
-
- switch (xdh_tag) {
- case DT_FLAGS_1:
-- if (xdh_val == DF_1_PIE)
-+ if (xdh_val & DF_1_PIE)
- ms->mode |= 0111;
- else
- ms->mode &= ~0111;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/4c410d2ce8ac4ffb7b15cc73c66cffdeee86e0de
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
