August 2013 - CRUX - lists.crux.nu

CRUX 3.0 in the cloud (EC2)
by Chris Kruger 09 Oct '14

09 Oct '14

Hi Folks, I don't know if anybody here uses Amazon's EC2, but maybe some here will be interested. I've always wanted to run CRUX in the cloud so I built an Amazon AMI (Amazon Machine Image) to allow me to do so. If anybody else is interested let me know and I can share the AMI with you. Chris K.

5 9

ports/opt (3.0): [notify] libtiff: patched for CVE-2013-4244
by crux＠crux.nu 28 Aug '13

28 Aug '13

commit b049fc6c70f8409810706e7da318f82cb78d3ba2 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 27 18:51:52 2013 +0200 [notify] libtiff: patched for CVE-2013-4244 diff --git a/libtiff/.md5sum b/libtiff/.md5sum index 40fe639..502f704 100644 --- a/libtiff/.md5sum +++ b/libtiff/.md5sum @@ -1,3 +1,4 @@ 6c1189a715708edc8ba926977b33895f gif2tiff-buffer-overflow.patch +2c0dabc854c95e7453fc56d2fd50a503 lzw-oob-write.patch 051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz 35aee7eea6949c2d26ffa52872991115 tiff2pdf_use-after-free.patch diff --git a/libtiff/Pkgfile b/libtiff/Pkgfile index 6e9a6cd..fa8a104 100644 --- a/libtiff/Pkgfile +++ b/libtiff/Pkgfile @@ -1,18 +1,20 @@ # Description: Library for manipulation of TIFF (Tag Image File Format) images -# URL: http://libtiff.maptools.org/ +# URL: http://www.remotesensing.org/libtiff/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu # Depends on: libjpeg, zlib name=libtiff version=4.0.3 -release=2 +release=3 source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz \ - gif2tiff-buffer-overflow.patch tiff2pdf_use-after-free.patch) + gif2tiff-buffer-overflow.patch tiff2pdf_use-after-free.patch lzw-oob-write.patch) build() { cd tiff-$version patch -d tools -p0 -i $SRC/tiff2pdf_use-after-free.patch patch -d tools -p0 -i $SRC/gif2tiff-buffer-overflow.patch + patch -d tools -p0 -i $SRC/lzw-oob-write.patch + ./configure --prefix=/usr --mandir=/usr/man make make DESTDIR=$PKG install diff --git a/libtiff/lzw-oob-write.patch b/libtiff/lzw-oob-write.patch new file mode 100644 index 0000000..674afc6 --- /dev/null +++ b/libtiff/lzw-oob-write.patch @@ -0,0 +1,18 @@ +Index: gif2tiff.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v +retrieving revision 1.12 +diff -u -r1.12 gif2tiff.c +--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12 ++++ gif2tiff.c 14 Aug 2013 04:28:07 -0000 +@@ -398,6 +398,10 @@ + } + + if (oldcode == -1) { ++ if (code >= clear) { ++ fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear); ++ return 0; ++ } + *(*fill)++ = suffix[code]; + firstchar = oldcode = code; + return 1;

1 0

ports/opt (3.0): [notify] chromium: updated to 29.0.1547.57
by crux＠crux.nu 23 Aug '13

23 Aug '13

commit 9fcbc4258031461af6ff9bebf00a904f89d1e207 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Fri Aug 23 11:42:29 2013 +0200 [notify] chromium: updated to 29.0.1547.57 This update includes 25 security fixes: http://googlechromereleases.blogspot.com/2013/08/stable-channel-update.html diff --git a/chromium/.footprint b/chromium/.footprint index 7e2007b..33e47b3 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -89,6 +89,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelected.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/segmentSelectedEnd.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/sessionStorage.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/settingsListRemove_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinner.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActive.gif -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/spinnerActiveSelected.gif @@ -159,6 +161,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resourcesPanel.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/revisionHistory.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/scriptsPanel.css +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/showhint.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sidebarPane.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/spectrum.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/splitView.css diff --git a/chromium/.md5sum b/chromium/.md5sum index 3d549c8..328fc23 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,3 @@ -38b5af2677211b696b807d3971560995 chromium-28.0.1500.95.tar.xz +3bc95940a7793fab81ad4b199a64c4bc chromium-29.0.1547.57.tar.xz 64968626706b07721983ac59fb3babbf chromium.sh 406827ad7d1fe469828cb76a4e19d67e nss-3.15.diff diff --git a/chromium/Pkgfile b/chromium/Pkgfile index ddb4b4a..0ab0f41 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,7 +5,7 @@ # Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher name=chromium -version=28.0.1500.95 +version=29.0.1547.57 release=1 source=(http://commondatastorage.googleapis.com/chromium-browser-official/$… \ $name.sh nss-3.15.diff) @@ -17,12 +17,6 @@ build() { sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>|<speech-dispatcher/libspeechd.h>|' \ -i build/linux/system.gyp - # fix for nss >= 3.15 - patch -p1 -i $SRC/nss-3.15.diff - - find third_party/WebKit/Source ui/base/ime \ - -type f -exec sed -e 's|<glib/.*\.h>|<glib.h>|g' -i {} \; - export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)" export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)" diff --git a/chromium/nss-3.15.diff b/chromium/nss-3.15.diff deleted file mode 100644 index 84534f1..0000000 --- a/chromium/nss-3.15.diff +++ /dev/null @@ -1,29 +0,0 @@ -Index: net/third_party/nss/ssl/bodge/secitem_array.c -diff --git a/net/third_party/nss/ssl/bodge/secitem_array.c b/net/third_party/nss/ssl/bodge/secitem_array.c -index ac80da8e4770106c4b50cc4e4c205c4183d2ad69..62e590742194012b49f17d72b0cdf383c135416a 100644 ---- a/net/third_party/nss/ssl/bodge/secitem_array.c -+++ b/net/third_party/nss/ssl/bodge/secitem_array.c -@@ -6,6 +6,7 @@ - * Support routines for SECItemArray data structure. - */ - -+#include "nssutil.h" - #include "seccomon.h" - #include "secitem.h" - #include "secerr.h" -@@ -13,10 +14,15 @@ - - typedef struct SECItemArrayStr SECItemArray; - -+#define NSSUTIL_VERSION_NUM \ -+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH) -+#if NSSUTIL_VERSION_NUM < 31500 -+// Added in NSS 3.15. - struct SECItemArrayStr { - SECItem *items; - unsigned int len; - }; -+#endif - - SECItemArray * - SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)

1 0

ports/opt (3.0): [notify] php: update to 5.4.19
by crux＠crux.nu 23 Aug '13

23 Aug '13

commit 358ee7663cd133ae3048d6373df7276400344e0e Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 23 10:11:42 2013 +0200 [notify] php: update to 5.4.19 Security fix, see http://www.php.net/ChangeLog-5.php#5.4.19 diff --git a/php/.md5sum b/php/.md5sum index 671d6e1..a8c680b 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -b2e185b46b22a48a385cf21a0dc76e65 php-5.4.18.tar.bz2 +f06f99b9872b503758adab5ba7a7e755 php-5.4.19.tar.bz2 diff --git a/php/Pkgfile b/php/Pkgfile index 0be43b0..b593851 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.4.18 +version=5.4.19 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (3.0): [notify] libtiff: fixes for CVE-2013-4231 CVE-2013-4232
by crux＠crux.nu 19 Aug '13

19 Aug '13

commit a04a2ddc7e7b56ef300aa9ad935f77ca73142fce Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Aug 19 19:10:53 2013 +0200 [notify] libtiff: fixes for CVE-2013-4231 CVE-2013-4232 See http://bugzilla.maptools.org/show_bug.cgi?id=2450 and http://bugzilla.maptools.org/show_bug.cgi?id=2449 diff --git a/libtiff/.md5sum b/libtiff/.md5sum index 10672da..40fe639 100644 --- a/libtiff/.md5sum +++ b/libtiff/.md5sum @@ -1 +1,3 @@ +6c1189a715708edc8ba926977b33895f gif2tiff-buffer-overflow.patch 051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz +35aee7eea6949c2d26ffa52872991115 tiff2pdf_use-after-free.patch diff --git a/libtiff/Pkgfile b/libtiff/Pkgfile index 4e95592..6e9a6cd 100644 --- a/libtiff/Pkgfile +++ b/libtiff/Pkgfile @@ -5,11 +5,14 @@ name=libtiff version=4.0.3 -release=1 -source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz) +release=2 +source=(http://download.osgeo.org/libtiff/tiff-$version.tar.gz \ + gif2tiff-buffer-overflow.patch tiff2pdf_use-after-free.patch) build() { cd tiff-$version + patch -d tools -p0 -i $SRC/tiff2pdf_use-after-free.patch + patch -d tools -p0 -i $SRC/gif2tiff-buffer-overflow.patch ./configure --prefix=/usr --mandir=/usr/man make make DESTDIR=$PKG install diff --git a/libtiff/gif2tiff-buffer-overflow.patch b/libtiff/gif2tiff-buffer-overflow.patch new file mode 100644 index 0000000..3c21718 --- /dev/null +++ b/libtiff/gif2tiff-buffer-overflow.patch @@ -0,0 +1,18 @@ +Index: gif2tiff.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v +retrieving revision 1.12 +diff -u -r1.12 gif2tiff.c +--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12 ++++ gif2tiff.c 13 Aug 2013 08:25:38 -0000 +@@ -333,6 +333,10 @@ + int status = 1; + + datasize = getc(infile); ++ ++ if (datasize > 12) ++ return 0; ++ + clear = 1 << datasize; + eoi = clear + 1; + avail = clear + 2; diff --git a/libtiff/tiff2pdf_use-after-free.patch b/libtiff/tiff2pdf_use-after-free.patch new file mode 100644 index 0000000..87673d9 --- /dev/null +++ b/libtiff/tiff2pdf_use-after-free.patch @@ -0,0 +1,15 @@ +Index: tiff2pdf.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v +retrieving revision 1.71 +diff -u -r1.71 tiff2pdf.c +--- tiff2pdf.c 2 May 2013 14:54:08 -0000 1.71 ++++ tiff2pdf.c 13 Aug 2013 04:45:40 -0000 +@@ -2462,6 +2462,7 @@ + TIFFFileName(input)); + t2p->t2p_error = T2P_ERR_ERROR; + _TIFFfree(buffer); ++ return(0); + } else { + buffer=samplebuffer; + t2p->tiff_datasize *= t2p->tiff_samplesperpixel;

1 0

Cannot build spamprobe
by Googlemail 19 Aug '13

19 Aug '13

I am trying to install spamprobe from the opt repository but it fails to build due to a coding error. Here is the report: GifParser.cc: In member function 'void GifParser::openImage()': GifParser.cc:102:40: error: too few arguments to function 'GifFileType* DGifOpen(void*, InputFunc, int*)' In file included from GifParser.h:37:0, from GifParser.cc:38: /usr/include/gif_lib.h:180:14: note: declared here It looks like an incompatibility between this package and giflib (also from opt). My giflib is version 5.0.4-1. Is there a patch for this? -- H Russman

3 2

ports/opt (3.0): [notify] php: update to 5.4.18
by crux＠crux.nu 16 Aug '13

16 Aug '13

commit 448989110d142743495b5c6558f256f23f86a2f1 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 16 10:13:29 2013 +0200 [notify] php: update to 5.4.18 Includes security fixes for CVE-2013-4113 and CVE-2013-4073, see http://www.php.net/ChangeLog-5.php#5.4.18 diff --git a/php/.footprint b/php/.footprint index 2899583..31cb94d 100644 --- a/php/.footprint +++ b/php/.footprint @@ -309,6 +309,8 @@ drwxr-xr-x root/root usr/lib/php/extensions/ -rwxr-xr-x root/root usr/lib/php/extensions/zip.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/phar.1.gz +-rw-r--r-- root/root usr/man/man1/phar.phar.1.gz -rw-r--r-- root/root usr/man/man1/php-config.1.gz -rw-r--r-- root/root usr/man/man1/php.1.gz -rw-r--r-- root/root usr/man/man1/phpize.1.gz diff --git a/php/.md5sum b/php/.md5sum index 8e1ae6b..671d6e1 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -1e027e99e2a874310fd518e87e3947af php-5.4.17.tar.bz2 +b2e185b46b22a48a385cf21a0dc76e65 php-5.4.18.tar.bz2 diff --git a/php/Pkgfile b/php/Pkgfile index 4800452..0be43b0 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.4.17 +version=5.4.18 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

VirtualBox port fails to install (Pkgbuild and post-install race condition)
by Peter A. Shevtsov 14 Aug '13

14 Aug '13

Hello, VirtualBox package fails to install with message: "chown: invalid group: 'root:vboxusers'" Pkgbuild:57 chown root:vboxusers $PKG/usr/share/$name/bin/VirtualBox but checking for vboxusers group and creation is done in post-install -- Peter A. Shevtsov

1 0

Problems updating gcc to 4.7.3
by Bernd Eggink 11 Aug '13

11 Aug '13

Hi, I'm presently doing a fresh install of Crux-3.0. Everything works fine, except the gcc update to 4.7.3. Output ends with these lines: ----------------------------------------------------------------------- checking whether i18n number rewriting support for quadmath_snprintf should be added... yes configure: updating cache ./config.cache checking generated-files-in-srcdir... no configure: creating ./config.status config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands config.status: executing libtool commands config.status: executing default-1 commands Adding multilib support to Makefile in ../../../gcc-4.7.3/libquadmath multidirs=32 with_multisubdir= Running configure in multilib subdirs 32 pwd: /usr/ports/core/gcc/work/src/build/x86_64-unknown-linux-gnu/libquadmath Running configure in multilib subdir 32 pwd: /usr/ports/core/gcc/work/src/build/x86_64-unknown-linux-gnu configure: creating cache ./config.cache checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking for --enable-version-specific-runtime-libs... no checking for style of include used by make... GNU checking for x86_64-unknown-linux-gnu-gcc... /usr/ports/core/gcc/work/src/build/./gcc/xgcc -B/usr/ports/core/gcc/work/src/build/./gcc/ -B/usr/x86_64-unknown-linux-gnu/bin/ -B/usr/x86_64-unknown-linux-gnu/lib/ -isystem /usr/x86_64-unknown-linux-gnu/include -isystem /usr/x86_64-unknown-linux-gnu/sys-include -m32 checking for C compiler default output file name... a.out checking whether the C compiler works... configure: error: in `/usr/ports/core/gcc/work/src/build/x86_64-unknown-linux-gnu/32/libquadmath': configure: error: cannot run C compiled programs. If you meant to cross compile, use `--host'. See `config.log' for more details. make[1]: *** [configure-target-libquadmath] Error 1 make[1]: Leaving directory `/usr/ports/core/gcc/work/src/build' make: *** [bootstrap] Error 2 ----------------------------------------------------------------------- Any ideas? It sounds somewhat weird that gcc "can't run C compiled programs"... Regards, Bernd -- http://sudrala.de

6 10

ports/opt (3.0): [notify] cups-filters: new dependency lcms2
by crux＠crux.nu 11 Aug '13

11 Aug '13

commit 0ad1f22d099c744ae57c763002c6db51b289e031 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Aug 11 11:31:07 2013 +0200 [notify] cups-filters: new dependency lcms2 Note ---- - depends on lcms2 now, see [1] - patch to fix build with poppler 0.24.0 [1] http://article.gmane.org/gmane.linux.distributions.crux.general/5515 diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index f621a10..b70a85b 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ f182d7717ed0a939a4f50e572939afdd cups-browsed f722074dfa8efd3fcb8502cede13a608 cups-filters-1.0.35.tar.xz +9e7dc5b52d8aabe1d35dc980a1b688ae cups-filters-poppler-0.24.patch diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 0c2c3f6..c8cf96b 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,20 +5,22 @@ name=cups-filters version=1.0.35 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + cups-browsed $name-poppler-0.24.patch) build () { cd $name-$version + patch -p0 -i $SRC/$name-poppler-0.24.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ --without-php \ --disable-avahi \ --without-rcdir \ - --with-browseremoteprotocols=cups + --with-browseremoteprotocols=cups make make DESTDIR=$PKG install diff --git a/cups-filters/cups-filters-poppler-0.24.patch b/cups-filters/cups-filters-poppler-0.24.patch new file mode 100644 index 0000000..2087010 --- /dev/null +++ b/cups-filters/cups-filters-poppler-0.24.patch @@ -0,0 +1,280 @@ +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… + +=== modified file 'filter/pdf.cxx' +--- filter/pdf.cxx 2012-08-19 22:31:27 +0000 ++++ filter/pdf.cxx 2013-08-01 15:48:06 +0000 +@@ -17,6 +17,10 @@ + #include "pdf.h" + + #include <PDFDoc.h> ++#include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + + extern "C" pdf_t * pdf_load_template(const char *filename) +@@ -343,7 +347,11 @@ + { + } + ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ Goffset getPos() ++#else + int getPos() ++#endif + { + return this->pos; + } + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2012-09-20 22:53:10 +0000 ++++ filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 +@@ -70,8 +70,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -297,19 +302,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,"Can't create temporary file"); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -319,23 +320,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,"Can't rewind temporary file"); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,"Can't fdopen temporary file"); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +-// parsePDFTOPDFComment(fp); // TODO? +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 08:32:55 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 +@@ -112,8 +112,13 @@ + #define MAX_OPVP_OPTIONS 20 + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -619,9 +624,6 @@ + char *s; + GooString name; + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; + char buf[4096]; + int n; + +@@ -633,8 +635,6 @@ + } + name.append("/XXXXXX"); + fd = mkstemp(name.getCString()); +- /* remove name */ +- unlink(name.getCString()); + if (fd < 0) { + opvpError(-1,"Can't create temporary file"); + exitCode = 2; +@@ -675,23 +675,10 @@ + goto err0; + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- opvpError(-1,"Can't rewind temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- opvpError(-1,"Can't fdopen temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- obj.initNull(); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(&name); ++ /* remove name */ ++ unlink(name.getCString()); + } else { + /* no jcl check */ + doc = new PDFDoc(fileName.copy()); + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-07-30 17:00:43 +0000 ++++ filter/pdftoraster.cxx 2013-08-01 15:48:06 +0000 +@@ -186,8 +186,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -1776,19 +1781,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,const_cast<char *>("Can't create temporary file")); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -1798,23 +1799,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,const_cast<char *>("Can't rewind temporary file")); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,const_cast<char *>("Can't fdopen temporary file")); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +- parsePDFTOPDFComment(fp); +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 +@@ -79,7 +79,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-08-02 11:13:38 +0000 ++++ filter/pdftoraster.cxx 2013-08-02 13:52:04 +0000 +@@ -199,7 +199,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 +@@ -121,7 +121,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } +

1 0