Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16952/10.4-transitional/unstable/main/finkinfo/graphics
Modified Files: stegdetect.info stegdetect.patch Log Message: New version that builds on modern gcc. Patched to avoid mixing fink's and internal libs and to prevent installing un-needed files that clash with other packages'. Index: stegdetect.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/stegdetect.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stegdetect.patch 27 Apr 2005 03:25:46 -0000 1.1 +++ stegdetect.patch 20 Dec 2005 07:43:07 -0000 1.2 @@ -1,12 +1,101 @@ -diff -Nurb stegdetect/Makefile.in stegdetect-new/Makefile.in ---- stegdetect/Makefile.in Sat Jan 26 15:51:00 2002 -+++ stegdetect-new/Makefile.in Fri Mar 21 18:33:39 2003 -@@ -52,7 +52,7 @@ - $(CC) $(CFLAGS) $(INCS) -o $@ $(DOBJS) -lm $(LIBS) $(FILELIB) +diff -Nurd -x'*~' stegdetect-0.6.orig/Makefile.in stegdetect-0.6/Makefile.in +--- stegdetect-0.6.orig/Makefile.in 2004-08-31 10:59:42.000000000 -0400 ++++ stegdetect-0.6/Makefile.in 2005-12-20 01:56:06.000000000 -0500 +@@ -70,12 +70,12 @@ - stegbreak: $(JPEGDEP) $(FILEDEP) $(BOBJS) -- $(CC) -static $(CFLAGS) $(INCS) -o $@ $(BOBJS) $(LIBS) $(FILELIB) -+ $(CC) $(CFLAGS) $(INCS) -o $@ $(BOBJS) $(LIBS) $(FILELIB) + JPEGDIR = ./jpeg-6b + JPEGINC = -I$(JPEGDIR) +-JPEGLIB = -L$(JPEGDIR) -ljpeg ++JPEGLIB = $(JPEGDIR)/libjpeg.a + JPEGDEP = $(JPEGDIR)/libjpeg.a - $(XSOBJS): - $(CC) $(CFLAGS) $(EVENTINC) $(GTKINC) -c $*.c + FILEDIR = ./file + FILEINC = -I$(FILEDIR) +-FILELIB = -L$(FILEDIR) -lfile ++FILELIB = $(FILEDIR)/libfile.a + FILEDEP = $(FILEDIR)/libfile.a + + GTKINC = @GTKINC@ +diff -Nurd -x'*~' stegdetect-0.6.orig/arc4.c stegdetect-0.6/arc4.c +--- stegdetect-0.6.orig/arc4.c 2004-08-29 19:11:00.000000000 -0400 ++++ stegdetect-0.6/arc4.c 2005-12-20 02:30:23.000000000 -0500 +@@ -29,6 +29,7 @@ + */ + + #include <sys/types.h> ++#include <string.h> + + #include "config.h" + +diff -Nurd -x'*~' stegdetect-0.6.orig/file/Makefile.in stegdetect-0.6/file/Makefile.in +--- stegdetect-0.6.orig/file/Makefile.in 2004-08-29 19:11:06.000000000 -0400 ++++ stegdetect-0.6/file/Makefile.in 2005-12-20 02:24:50.000000000 -0500 +@@ -78,7 +78,7 @@ + @[EMAIL PROTECTED] = magic.5 + @[EMAIL PROTECTED] = magic.4 + fsect = @fsect@ +-man_MANS = file.1 $(man_MAGIC) ++man_MANS = + + libfile_a_SOURCES = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c compress.c is_tar.c readelf.c print.c file.h names.h patchlevel.h readelf.h tar.h magic.c + +diff -Nurd -x'*~' stegdetect-0.6.orig/jpeg-6b/makefile.cfg stegdetect-0.6/jpeg-6b/makefile.cfg +--- stegdetect-0.6.orig/jpeg-6b/makefile.cfg 2004-08-29 19:11:09.000000000 -0400 ++++ stegdetect-0.6/jpeg-6b/makefile.cfg 2005-12-20 02:15:26.000000000 -0500 +@@ -193,7 +193,9 @@ + + # Installation rules: + +-install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ ++install: ++ ++install_ORIG: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@ + $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg + $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg + $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran +diff -Nurd -x'*~' stegdetect-0.6.orig/jutil.c stegdetect-0.6/jutil.c +--- stegdetect-0.6.orig/jutil.c 2004-08-29 19:41:48.000000000 -0400 ++++ stegdetect-0.6/jutil.c 2005-12-20 01:50:43.000000000 -0500 +@@ -41,6 +41,7 @@ + #include <fcntl.h> + #include <err.h> + #include <math.h> ++#include <string.h> + + #include <jpeglib.h> + +diff -Nurd -x'*~' stegdetect-0.6.orig/md5.c stegdetect-0.6/md5.c +--- stegdetect-0.6.orig/md5.c 2004-08-29 20:16:47.000000000 -0400 ++++ stegdetect-0.6/md5.c 2005-12-20 01:51:06.000000000 -0500 +@@ -24,6 +24,7 @@ + public domain. */ + + #include <sys/types.h> ++#include <string.h> + + #ifdef HAVE_CONFIG_H + #include "config.h" +diff -Nurd -x'*~' stegdetect-0.6.orig/stegbreak.c stegdetect-0.6/stegbreak.c +--- stegdetect-0.6.orig/stegbreak.c 2004-08-29 19:11:00.000000000 -0400 ++++ stegdetect-0.6/stegbreak.c 2005-12-20 02:35:35.000000000 -0500 +@@ -597,7 +597,7 @@ + total_count += count; + fprintf(stderr, "Processed %d files, found %d embeddings.\n", + n, found); +- fprintf(stderr, "Time: %d seconds: Cracks: %d, % 8.1f c/s\n", ++ fprintf(stderr, "Time: %ld seconds: Cracks: %d, % 8.1f c/s\n", + now, total_count, (float)total_count/now); + } else + fprintf(stderr, "Converted %d files.\n", n); +diff -Nurd -x'*~' stegdetect-0.6.orig/stegdetect.c stegdetect-0.6/stegdetect.c +--- stegdetect-0.6.orig/stegdetect.c 2004-09-03 00:01:35.000000000 -0400 ++++ stegdetect-0.6/stegdetect.c 2005-12-20 01:49:59.000000000 -0500 +@@ -1046,7 +1046,7 @@ + } + } + done: +- fprintf(stdout, " %s(%d)<[%s][", what, ++ fprintf(stdout, " %s(%ld)<[%s][", what, + buflen, is_random(buf, buflen) ? "random" : "nonrandom"); + noprint = 0; + /* Prints to stdout */ Index: stegdetect.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/stegdetect.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stegdetect.info 27 Apr 2005 03:25:46 -0000 1.1 +++ stegdetect.info 20 Dec 2005 07:43:07 -0000 1.2 @@ -1,25 +1,25 @@ Package: stegdetect -Version: 0.5 -Revision: 11 +Version: 0.6 +Revision: 1 ### Description: Detects data hidden in JPEG files License: BSD Maintainer: James Gibbs <[EMAIL PROTECTED]> ### Source: http://www.outguess.org/%n-%v.tar.gz -Source-MD5: 6f3708bb15fd629ced835d12f561e82b -SourceDirectory: %n +Source-MD5: 850a3551b5c450b9f450a919ad021767 Patch: %n.patch -BuildDepends: gcc3.1 +PatchScript: << + head -n 29 stegdetect.c > Copyright +<< +Depends: libjpeg-bin ### SetCFLAGS: -no-cpp-precomp -SetCC: gcc3 -NoSetCXXFLAGS: true -#GCC: 3.1 +NoSetCPPFLAGS: true +ConfigureParams: --datadir=%p/share/%n --mandir=%p/share/man ### InstallScript: << -make install prefix=%i mandir=%i/share/man datadir=%i/share -head -n 29 stegdetect.c > Copyright +make install DESTDIR=%d << ### DocFiles: Copyright @@ -44,11 +44,10 @@ << ### DescPort: << -Patched file/Makefile.in to add -no-cpp-precomp to CPPFLAGS. Patched Makefile.in -to remove -static from stegbreak build. CFLAGS set to -no-cpp-precomp to avoid an -"illegal instruction" while running "stegbreak -tj myjpeg.jpg" +CFLAGS set to -no-cpp-precomp to avoid an "illegal instruction" while +running "stegbreak -tj myjpeg.jpg" -rev. 11 (dmrrsn): We don't need the GCC flag since g++ is not called, but -if we *did* need it, its value would be 3.1 (since we explicitly call gcc3, -setting the compiler to gcc3.1 rather than gcc3.3). +v 0.6-1 (dmacks): new %v that works with gcc>=3.3; patched to force +linking to included jpeg and file/magic libs. Goal: avoid all fink +libs and headers entirely. << ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits