diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-09-25 19:39:12 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-09-25 19:39:12 +0200 |
| commit | 00f2e7b2f5cdd40bf9701c90a6e91bf48d97fa8a (patch) | |
| tree | 71ea2aab57851165a4a8a8b3f2ef14f0d13055b2 /app-arch/unrar/files | |
| parent | profiles: drop package.mask on slotted wine (diff) | |
| download | gentoo-00f2e7b2f5cdd40bf9701c90a6e91bf48d97fa8a.tar.gz gentoo-00f2e7b2f5cdd40bf9701c90a6e91bf48d97fa8a.tar.bz2 gentoo-00f2e7b2f5cdd40bf9701c90a6e91bf48d97fa8a.zip | |
app-arch/unrar: Security cleanup
Bug: https://bugs.gentoo.org/628182
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'app-arch/unrar/files')
| -rw-r--r-- | app-arch/unrar/files/unrar-5.0.2-build.patch | 45 | ||||
| -rw-r--r-- | app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch | 17 |
2 files changed, 0 insertions, 62 deletions
diff --git a/app-arch/unrar/files/unrar-5.0.2-build.patch b/app-arch/unrar/files/unrar-5.0.2-build.patch deleted file mode 100644 index 61de7ee06891..000000000000 --- a/app-arch/unrar/files/unrar-5.0.2-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -do not let these targets depend on clean, otherwise it could run in -parallel with the object compile which runs into races -https://bugs.gentoo.org/461806 - -While we're in here, fix up a few other things: - - append -pthread to LDFLAGS instead of replacing them - - do not bother with `rm` in the output since linking will clober it - - use CXXFLAGS when linking - - append LIBFLAGS to the individual targets instead of the final link - ---- a/makefile -+++ b/makefile -@@ -7,7 +7,7 @@ - LIBFLAGS=-fPIC - DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP - STRIP=strip --LDFLAGS=-pthread -+LDFLAGS+=-pthread - DESTDIR=/usr - - # Linux using LCC -@@ -119,8 +119,7 @@ - @rm -f *.o *.bak *~ - - unrar: clean $(OBJECTS) $(UNRAR_OBJ) -- @rm -f unrar -- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) -+ $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) - $(STRIP) unrar - - sfx: WHAT=SFX_MODULE -@@ -130,10 +129,9 @@ - $(STRIP) default.sfx - - lib: WHAT=RARDLL --lib: CXXFLAGS+=$(LIBFLAGS) --lib: clean $(OBJECTS) $(LIB_OBJ) -- @rm -f libunrar.so -- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) -+$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) -+lib: $(OBJECTS) $(LIB_OBJ) -+ $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) - - install-unrar: - install -D unrar $(DESTDIR)/bin/unrar diff --git a/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch b/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch deleted file mode 100644 index ff78363cd5c0..000000000000 --- a/app-arch/unrar/files/unrar-5.2.2-no-auto-clean.patch +++ /dev/null @@ -1,17 +0,0 @@ -if clean runs in parallel with $(OBJECTS), it is possible to build some -objects first, then the clean target fires and deletes some, and then we -try to link and fail. - -https://bugs.gentoo.org/528218 - ---- a/makefile -+++ b/makefile -@@ -118,7 +118,7 @@ - clean: - @rm -f *.o *.bak *~ - --unrar: clean $(OBJECTS) $(UNRAR_OBJ) -+unrar: $(OBJECTS) $(UNRAR_OBJ) - $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) - $(STRIP) unrar - |