diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-text/antiword/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-text/antiword/files')
| -rw-r--r-- | app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch | 17 | ||||
| -rw-r--r-- | app-text/antiword/files/antiword-0.37-prefix.patch | 71 |
2 files changed, 88 insertions, 0 deletions
diff --git a/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch new file mode 100644 index 000000000000..8b6baf9b2ca2 --- /dev/null +++ b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch @@ -0,0 +1,17 @@ +index 8a95fb9..7797d1f 100644 +--- a/wordole.c ++++ b/wordole.c +@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile, + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if (tNameSize >= sizeof(atPPSlist[0].szName)) { ++ werr(0, "PPS %d appears to be invalid.", iIndex); ++ atPPSlist = xfree(atPPSlist); ++ return FALSE; ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { +-- +2.1.2 diff --git a/app-text/antiword/files/antiword-0.37-prefix.patch b/app-text/antiword/files/antiword-0.37-prefix.patch new file mode 100644 index 000000000000..40053696f52e --- /dev/null +++ b/app-text/antiword/files/antiword-0.37-prefix.patch @@ -0,0 +1,71 @@ +--- antiword.h ++++ antiword.h +@@ -191,43 +191,11 @@ + #define FONT_SANS_SERIF_ITALIC "Helvetica-Oblique" + #define FONT_SANS_SERIF_BOLDITALIC "Helvetica-BoldOblique" + /* The name of the antiword directories and the font information file */ +-#if defined(__dos) +-#define GLOBAL_ANTIWORD_DIR "C:\\antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontname.txt" +-#elif defined(__amigaos) +-#define GLOBAL_ANTIWORD_DIR "SYS:.antiword" +-#define ANTIWORD_DIR ".antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(N_PLAT_NLM) +-#define GLOBAL_ANTIWORD_DIR "SYS:/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontname.txt" +-#elif defined(__vms) +-#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__BEOS__) +-#define GLOBAL_ANTIWORD_DIR "/boot/home/config/apps/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__CYGMING__) +-#define GLOBAL_ANTIWORD_DIR "C:\\antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__Plan9__) +-#define GLOBAL_ANTIWORD_DIR "/sys/lib/antiword" +-#define ANTIWORD_DIR "lib/antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__sun__) +-#define GLOBAL_ANTIWORD_DIR "/usr/local/share/antiword" ++#ifndef GLOBAL_ANTIWORD_DIR ++#error "GLOBAL_ANTIWORD_DIR is unset!" ++#endif + #define ANTIWORD_DIR ".antiword" + #define FONTNAMES_FILE "fontnames" +-#else /* All others */ +-#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" +-#define ANTIWORD_DIR ".antiword" +-#define FONTNAMES_FILE "fontnames" +-#endif /* __dos */ + /* The names of grouped mapping files */ + /* ASCII */ + #define MAPPING_FILE_CP437 "cp437.txt" +--- Makefile ++++ Makefile +@@ -36,8 +36,8 @@ + LOCAL_INSTALL_DIR = $(HOME)/bin + LOCAL_RESOURCES_DIR = $(HOME)/.antiword + +-GLOBAL_INSTALL_DIR = /usr/bin +-GLOBAL_RESOURCES_DIR = /usr/share/antiword ++GLOBAL_INSTALL_DIR = $(PREFIX)/usr/bin ++GLOBAL_RESOURCES_DIR = $(PREFIX)/usr/share/antiword + + all: $(PROGS) + +@@ -83,7 +83,7 @@ + @chmod 750 $@ + + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) '-DGLOBAL_ANTIWORD_DIR="$(GLOBAL_RESOURCES_DIR)"' -c $< + + main_u.o: version.h + postscript.o: version.h |