D5504.id13437.diff
View Options

	diff --git a/files/change-dest-for-mgc-file.patch b/files/change-dest-for-mgc-file.patch
	--- a/files/change-dest-for-mgc-file.patch
	+++ b/files/change-dest-for-mgc-file.patch
	@@ -1,11 +1,24 @@
	---- configure.orig 2013-03-11 23:45:59.396775678 -0400
	-+++ configure 2013-03-11 23:39:36.311776489 -0400
	-@@ -3514,7 +3514,7 @@
	- fi
	-
	-
	--pkgdatadir='$(datadir)/misc'
	-+pkgdatadir='$(datadir)/file'
	-
	-
	- if test x$fsect = x5; then
	+From 5e83734a080554a5d52cc78df4a029a85dd2d33c Mon Sep 17 00:00:00 2001
	+From: Philipp Trulson <philipp@trulson.de>
	+Date: Fri, 22 Feb 2019 11:58:56 +0100
	+Subject: [PATCH] change-dest-for-mgc-file
	+
	+---
	+ configure.ac \| 2 +-
	+ 1 file changed, 1 insertion(+), 1 deletion(-)
	+
	+diff --git a/configure.ac b/configure.ac
	+index ec296aa4..e619d389 100644
	+--- a/configure.ac
	++++ b/configure.ac
	+@@ -71,7 +71,7 @@ esac
	+ AC_SUBST(MINGW)
	+ AM_CONDITIONAL(MINGW, test "$MINGW" = 1)
	+
	+-AC_SUBST([pkgdatadir], ['$(datadir)/misc'])
	++AC_SUBST([pkgdatadir], ['$(datadir)/file'])
	+ AC_SUBST(fsect)
	+ AM_CONDITIONAL(FSECT5, test x$fsect = x5)
	+
	+--
	+2.20.1
	diff --git a/files/security/cve-2018-10360.patch b/files/security/cve-2018-10360.patch
	deleted file mode 100644
	--- a/files/security/cve-2018-10360.patch
	+++ /dev/null
	@@ -1,14 +0,0 @@
	-diff --git a/src/readelf.c b/src/readelf.c
	-index 79c83f9f..1f41b461 100644
	---- a/src/readelf.c
	-+++ b/src/readelf.c
	-@@ -842,7 +842,8 @@ do_core_note(struct magic_set ms, unsigned char nbuf, uint32_t type,
	-
	- cname = (unsigned char *)
	- &nbuf[doff + prpsoffsets(i)];
	-- for (cp = cname; cp && isprint(cp); cp++)
	-+ for (cp = cname; cp < nbuf + size && *cp
	-+ && isprint(*cp); cp++)
	- continue;
	- /*
	- * Linux apparently appends a space at the end
	diff --git a/package.yml b/package.yml
	--- a/package.yml
	+++ b/package.yml
	@@ -1,8 +1,8 @@
	name : file
	-version : '5.32'
	-release : 16
	+version : '5.36'
	+release : 17
	source :
	- - ftp://ftp.astron.com/pub/file/file-5.32.tar.gz : 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50
	+ - git\|https://github.com/file/file.git : FILE5_36
	homepage : http://www.darwinsys.com/file
	license : BSD-2-Clause
	component : system.base
	@@ -11,10 +11,9 @@
	description: \|
	file is a command used to guess the "file type" of a file. It reads the content to determine the data.
	setup : \|
	- %patch -p0 < $pkgfiles/change-dest-for-mgc-file.patch
	- %patch -p1 < $pkgfiles/security/cve-2018-10360.patch
	- %configure --disable-static \
	- --enable-shared
	+ %patch -p1 < $pkgfiles/change-dest-for-mgc-file.patch
	+ %reconfigure --disable-static \
	+ --enable-shared
	build : \|
	%make
	install : \|
	@@ -23,7 +22,7 @@
	%make check

	# If these don't pass, ypkg will create very broken packages
	- TEST1=`file /usr/lib64/libc-2.27.so \| grep "ELF 64-bit LSB shared object" \| wc -l`
	+ TEST1=`file /usr/lib64/libc-2.29.so \| grep "ELF 64-bit LSB shared object" \| wc -l`
	TEST2=`file /usr/bin/file \| grep "ELF 64-bit LSB executable" \| wc -l`
	if [ $TEST1 -eq 0 ]; then
	echo "Failed TEST1"
	diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
	--- a/pspec_x86_64.xml
	+++ b/pspec_x86_64.xml
	@@ -3,8 +3,8 @@
	<Name>file</Name>
	<Homepage>http://www.darwinsys.com/file</Homepage>
	<Packager>
	- <Name>Peter O'Connor</Name>
	- <Email>peter@solus-project.com</Email>
	+ <Name>Philipp Trulson</Name>
	+ <Email>philipp@trulson.de</Email>
	</Packager>
	<License>BSD-2-Clause</License>
	<PartOf>system.base</PartOf>
	@@ -37,7 +37,7 @@
	</Description>
	<PartOf>system.devel</PartOf>
	<RuntimeDependencies>
	- <Dependency release="16">file</Dependency>
	+ <Dependency release="17">file</Dependency>
	</RuntimeDependencies>
	<Files>
	<Path fileType="header">/usr/include/magic.h</Path>
	@@ -45,12 +45,12 @@
	</Files>
	</Package>
	<History>
	- <Update release="16">
	- <Date>2018-06-17</Date>
	- <Version>5.32</Version>
	+ <Update release="17">
	+ <Date>2019-02-22</Date>
	+ <Version>5.36</Version>
	<Comment>Packaging update</Comment>
	- <Name>Peter O'Connor</Name>
	- <Email>peter@solus-project.com</Email>
	+ <Name>Philipp Trulson</Name>
	+ <Email>philipp@trulson.de</Email>
	</Update>
	</History>
	</PISI>
	\ No newline at end of file

File Metadata

Mime Type: text/plain
Expires: Thu, Aug 10, 2:08 PM (1 d, 2 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5807813
Default Alt Text: D5504.id13437.diff (4 KB)

D5504.id13437.diff
No OneTemporary
Actions

D5504.id13437.diff
View Options

File Metadata

Event Timeline

D5504.id13437.diffNo OneTemporaryActions

D5504.id13437.diffView Options

File Metadata

Event Timeline

D5504.id13437.diff
No OneTemporary
Actions

D5504.id13437.diff
View Options