[arch-commits] Commit in hylafax/trunk (3 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Sep 20 09:32:35 UTC 2012
Date: Thursday, September 20, 2012 @ 05:32:34
Author: tpowa
Revision: 166868
upgpkg: hylafax 6.0.6-1
bump to latest version
Modified:
hylafax/trunk/PKGBUILD
Deleted:
hylafax/trunk/configure-6.0.5.patch
hylafax/trunk/hylafax-libtiff4.patch
------------------------+
PKGBUILD | 25 +----
configure-6.0.5.patch | 11 --
hylafax-libtiff4.patch | 229 -----------------------------------------------
3 files changed, 9 insertions(+), 256 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-09-20 08:00:35 UTC (rev 166867)
+++ PKGBUILD 2012-09-20 09:32:34 UTC (rev 166868)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Paul Mattal <paul at archlinux.org>
pkgname=hylafax
-pkgver=6.0.5
-pkgrel=6
+pkgver=6.0.6
+pkgrel=1
pkgdesc="Fax Server"
arch=('i686' 'x86_64')
install='hylafax.install'
@@ -17,25 +17,12 @@
hylafax
hylafax.cron.daily
config.local
- configure-6.0.5.patch
- hylafax-libtiff4.patch
faxq.service
hfaxd.service)
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
- '6602288a405324d8c8e3c5eac2bf19fd'
- '52beffe7dc296b4f9ce9fd0387f7804e'
- '60f2a7e62c256ead4e9238cb31b35b90'
- '51d9f639bb76e5e39cdc8e2ac07e208d'
- '3d239c186f24720e945508d349b069b1'
- '832c8e8098e2dfa56040c975b554590c'
- '38a00db6d9d765d130b2d8d3a98e5c24')
-build() {
+build () {
cd "$srcdir/${pkgname}-${pkgver}"
cp ../config.local .
- # fix compiling
- patch -Np0 -i ../configure-6.0.5.patch
- patch -Np1 -i ../hylafax-libtiff4.patch
./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
make
}
@@ -58,3 +45,9 @@
install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
}
+md5sums=('d063d45049c8fcbabefe09d662313067'
+ '6602288a405324d8c8e3c5eac2bf19fd'
+ '52beffe7dc296b4f9ce9fd0387f7804e'
+ '60f2a7e62c256ead4e9238cb31b35b90'
+ '832c8e8098e2dfa56040c975b554590c'
+ '38a00db6d9d765d130b2d8d3a98e5c24')
Deleted: configure-6.0.5.patch
===================================================================
--- configure-6.0.5.patch 2012-09-20 08:00:35 UTC (rev 166867)
+++ configure-6.0.5.patch 2012-09-20 09:32:34 UTC (rev 166868)
@@ -1,11 +0,0 @@
---- configure.old 2011-08-08 10:19:37.619657223 +0200
-+++ configure 2011-08-08 10:20:26.422189170 +0200
-@@ -2882,7 +2882,7 @@
- echo '#define HAS_FCHMOD 1'
- Note "... configure use of fchmod"
- CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
-- unistd.h libc.h $OSFCNH sys/stat.h
-+ unistd.h $OSFCNH sys/stat.h libc.h
- }
- CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
- unistd.h sys/stat.h
Deleted: hylafax-libtiff4.patch
===================================================================
--- hylafax-libtiff4.patch 2012-09-20 08:00:35 UTC (rev 166867)
+++ hylafax-libtiff4.patch 2012-09-20 09:32:34 UTC (rev 166868)
@@ -1,229 +0,0 @@
---- hylafax-6.0.5/configure 2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/configure 2012-01-02 17:44:20.000000000 -0500
-@@ -2531,6 +2566,7 @@
- Note "... checking TIFF library version"
- tiff_runlen_t=""
- cat>t.c<<EOF
-+#include <stdlib.h>
- #include <stdio.h>
- #include "tiffio.h"
- main()
-@@ -2550,8 +2586,18 @@
- Note " Found libtiff version ${lib_ver}"
- if [ ${header_ver} -ge 19960307 ]; then
- case ${lib_ver} in
-- 3.4) tiff_runlen_t="uint16" ;;
-- 3.[56789]) tiff_runlen_t="uint32" ;;
-+ 3.4) tiff_runlen_t="uint16"
-+ echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+ echo '#define TIFFVERSION TIFF_VERSION'
-+ echo '#define TIFFHEADER TIFFHeader';;
-+ 3.[56789]) tiff_runlen_t="uint32"
-+ echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+ echo '#define TIFFVERSION TIFF_VERSION'
-+ echo '#define TIFFHEADER TIFFHeader';;
-+ 4.0) tiff_runlen_t="uint32"
-+ echo '#define TIFFSTRIPBYTECOUNTS uint64'
-+ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
-+ echo '#define TIFFHEADER TIFFHeaderClassic';;
- esac
- fi
- else
-@@ -2588,7 +2634,7 @@
- Incompatible TIFF Library.
-
- HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
--3.9. If you do not have up to date TIFF software on your system
-+4.0. If you do not have up to date TIFF software on your system
- then you can retrieve it from the location where you obtained this software.
- The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
- EOF
---- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-02 17:44:19.000000000 -0500
-@@ -164,26 +142,26 @@
- * a single IFD/image from a TIFF file.
- */
- typedef struct {
-- TIFFDirEntry SubFileType;
-- TIFFDirEntry ImageWidth;
-- TIFFDirEntry ImageLength;
-- TIFFDirEntry BitsPerSample;
-- TIFFDirEntry Compression;
-- TIFFDirEntry Photometric;
-- TIFFDirEntry FillOrder;
-- TIFFDirEntry StripOffsets;
-- TIFFDirEntry Orientation;
-- TIFFDirEntry SamplesPerPixel;
-- TIFFDirEntry RowsPerStrip;
-- TIFFDirEntry StripByteCounts;
-- TIFFDirEntry XResolution;
-- TIFFDirEntry YResolution;
-- TIFFDirEntry Options; // T4 or T6
-- TIFFDirEntry ResolutionUnit;
-- TIFFDirEntry PageNumber;
-- TIFFDirEntry BadFaxLines;
-- TIFFDirEntry CleanFaxData;
-- TIFFDirEntry ConsecutiveBadFaxLines;
-+ HFClassicTIFFDirEntry SubFileType;
-+ HFClassicTIFFDirEntry ImageWidth;
-+ HFClassicTIFFDirEntry ImageLength;
-+ HFClassicTIFFDirEntry BitsPerSample;
-+ HFClassicTIFFDirEntry Compression;
-+ HFClassicTIFFDirEntry Photometric;
-+ HFClassicTIFFDirEntry FillOrder;
-+ HFClassicTIFFDirEntry StripOffsets;
-+ HFClassicTIFFDirEntry Orientation;
-+ HFClassicTIFFDirEntry SamplesPerPixel;
-+ HFClassicTIFFDirEntry RowsPerStrip;
-+ HFClassicTIFFDirEntry StripByteCounts;
-+ HFClassicTIFFDirEntry XResolution;
-+ HFClassicTIFFDirEntry YResolution;
-+ HFClassicTIFFDirEntry Options; // T4 or T6
-+ HFClassicTIFFDirEntry ResolutionUnit;
-+ HFClassicTIFFDirEntry PageNumber;
-+ HFClassicTIFFDirEntry BadFaxLines;
-+ HFClassicTIFFDirEntry CleanFaxData;
-+ HFClassicTIFFDirEntry ConsecutiveBadFaxLines;
- uint32 link; // offset to next directory
- uint32 xres[2]; // X resolution indirect value
- uint32 yres[2]; // Y resolution indirect value
-@@ -226,10 +204,10 @@
- * amount of image data and then adding in
- * the expected data for the TIFF headers.
- */
-- uint32* sb;
-+ TIFFSTRIPBYTECOUNTS* sb;
- TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
- file_size = sizeof (DirTemplate) +
-- sizeof (TIFFHeader) + sizeof (uint16);
-+ sizeof (TIFFHEADER) + sizeof (uint16);
- for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
- file_size += sb[s];
- reply(code, "%s for %s (%lu bytes).",
-@@ -261,10 +239,10 @@
- if (fd >= 0) {
- union {
- char buf[512];
-- TIFFHeader h;
-+ TIFFHEADER h;
- } b;
- ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
-- if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
-+ if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
- (b.h.tiff_magic == TIFF_BIGENDIAN ||
- b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
- (void) lseek(fd, 0L, SEEK_SET); // rewind
-@@ -318,12 +296,12 @@
- }
-
- static void
--getLong(TIFF* tif, TIFFDirEntry& de)
-+getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
- TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
- }
- static void
--getShort(TIFF* tif, TIFFDirEntry& de)
-+getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
- uint16 v;
- TIFFGetField(tif, de.tdir_tag, &v);
-@@ -343,7 +321,7 @@
- {
- static DirTemplate templ = {
- #define TIFFdiroff(v) \
-- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
-+ (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
- (intptr_t) &(((DirTemplate*) 0)->v))
- { TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 },
- { TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 },
-@@ -368,7 +346,7 @@
- 0, // next directory
- { 0, 1 }, { 0, 1 }, // x+y resolutions
- };
--#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
-+#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
- /*
- * Construct the TIFF header for this IFD using
- * the preconstructed template above. We extract
-@@ -377,14 +355,14 @@
- * of things about the contents of the TIFF file.
- */
- struct {
-- TIFFHeader h;
-+ TIFFHEADER h;
- uint16 dircount;
- u_char dirstuff[sizeof (templ)];
- } buf;
- union { int32 i; char c[4]; } u; u.i = 1;
- buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
-- buf.h.tiff_version = TIFF_VERSION;
-- buf.h.tiff_diroff = sizeof (TIFFHeader);
-+ buf.h.tiff_version = TIFFVERSION;
-+ buf.h.tiff_diroff = sizeof (TIFFHEADER);
- buf.dircount = (uint16) NTAGS;
- getLong(tif, templ.SubFileType);
- getLong(tif, templ.ImageWidth);
-@@ -412,7 +390,7 @@
- getShort(tif, templ.CleanFaxData);
- getLong(tif, templ.ConsecutiveBadFaxLines);
- if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
-- TIFFDirEntry* dp = &templ.SubFileType;
-+ HFClassicTIFFDirEntry* dp = &templ.SubFileType;
- for (u_int i = 0; i < NTAGS; i++) {
- if (dp->tdir_type == TIFF_SHORT)
- dp->tdir_offset <<= 16;
-@@ -441,7 +419,7 @@
- bool
- HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
- {
-- uint32* sb;
-+ TIFFSTRIPBYTECOUNTS* sb;
- (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
- tdata_t buf = _TIFFmalloc(sb[0]);
- tsize_t bsize = sb[0];
---- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2012-01-28 15:27:47.000000000 -0500
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-28 15:30:12.000000000 -0500
-@@ -69,7 +69,7 @@
-
-
- static bool
--isTIFF(const TIFFHeader& h)
-+isTIFF(const TIFFHEADER& h)
- {
- if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
- return (false);
-@@ -82,11 +82,23 @@
- // byte swap version stamp if opposite byte order
- if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
- TIFFSwabShort(&version);
-- return (version == TIFF_VERSION);
-+ return (version == TIFFVERSION);
- }
-
-
- /*
-+ * This is copied right from tiff.h in version 3.8.2. This was necessary
-+ * to localize here because it was removed from tiff.h in version 4.0.
-+ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
-+ */
-+typedef struct {
-+ uint16 tdir_tag;
-+ uint16 tdir_type; /* data type */
-+ uint32 tdir_count; /* number of items; length in spec */
-+ uint32 tdir_offset; /* byte offset to field data */
-+} HFClassicTIFFDirEntry;
-+
-+/*
- * Record a file transfer in the log file.
- */
- void
-@@ -957,7 +957,7 @@
- if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
- union {
- char buf[512];
-- TIFFHeader h;
-+ TIFFHEADER h;
- } b;
- ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
- if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
More information about the arch-commits
mailing list