Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto In directory vz-cvs-3.sog:/tmp/cvs-serv9553/10.4/unstable/main/finkinfo/crypto
Modified Files: arj.info arj.patch Log Message: Update arj package to pass validation & build on 10.7 Index: arj.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/arj.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- arj.patch 30 Nov 2010 21:03:09 -0000 1.3 +++ arj.patch 12 Sep 2011 12:26:51 -0000 1.4 @@ -1,6 +1,6 @@ -diff -ruN arj-3.10.22/arj_arcv.c arj-3.10.22-patched/arj_arcv.c +diff -ru arj-3.10.22/arj_arcv.c arj-3.10.22-patched/arj_arcv.c --- arj-3.10.22/arj_arcv.c 2005-06-21 21:53:12.000000000 +0200 -+++ arj-3.10.22-patched/arj_arcv.c 2010-11-30 21:45:08.000000000 +0100 ++++ arj-3.10.22-patched/arj_arcv.c 2011-09-11 18:10:09.000000000 +0200 @@ -59,27 +59,27 @@ #define setup_hput(ptr) (tmp_hptr=(ptr)) @@ -59,9 +59,9 @@ } /* Calculates and stores the basic header size */ -diff -ruN arj-3.10.22/arj_proc.c arj-3.10.22-patched/arj_proc.c +diff -ru arj-3.10.22/arj_proc.c arj-3.10.22-patched/arj_proc.c --- arj-3.10.22/arj_proc.c 2005-06-21 21:53:12.000000000 +0200 -+++ arj-3.10.22-patched/arj_proc.c 2010-11-30 21:45:08.000000000 +0100 ++++ arj-3.10.22-patched/arj_proc.c 2011-09-11 18:10:09.000000000 +0200 @@ -585,7 +585,7 @@ /* Returns the exact amount of data that could be safely written to the destination volume */ @@ -140,9 +140,9 @@ { mput_word(d&0xFFFF, p); mput_word(d>>16 , p+2); -diff -ruN arj-3.10.22/arj_proc.h arj-3.10.22-patched/arj_proc.h +diff -ru arj-3.10.22/arj_proc.h arj-3.10.22-patched/arj_proc.h --- arj-3.10.22/arj_proc.h 2004-01-25 11:39:30.000000000 +0100 -+++ arj-3.10.22-patched/arj_proc.h 2010-11-30 21:50:14.000000000 +0100 ++++ arj-3.10.22-patched/arj_proc.h 2011-09-11 18:10:09.000000000 +0200 @@ -8,15 +8,17 @@ #ifndef ARJ_PROC_INCLUDED #define ARJ_PROC_INCLUDED @@ -191,9 +191,9 @@ #endif #endif -diff -ruN arj-3.10.22/environ.c arj-3.10.22-patched/environ.c +diff -ru arj-3.10.22/environ.c arj-3.10.22-patched/environ.c --- arj-3.10.22/environ.c 2004-06-18 18:19:36.000000000 +0200 -+++ arj-3.10.22-patched/environ.c 2010-09-28 12:51:48.000000000 +0200 ++++ arj-3.10.22-patched/environ.c 2011-09-11 18:10:09.000000000 +0200 @@ -58,7 +58,7 @@ #include <sys/ioctl.h> #include <sys/statfs.h> @@ -203,9 +203,30 @@ #include <sys/param.h> #include <sys/mount.h> #elif defined(__QNXNTO__) -diff -ruN arj-3.10.22/gnu/configure.in arj-3.10.22-patched/gnu/configure.in +diff -ru arj-3.10.22/fardata.c arj-3.10.22-patched/fardata.c +--- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200 ++++ arj-3.10.22-patched/fardata.c 2011-09-11 18:13:03.000000000 +0200 +@@ -190,7 +190,7 @@ + + /* Length-limited strlen() */ + +-static int strnlen(const char FAR *s, int count) ++static int strnlen_intern(const char FAR *s, int count) + { + const char FAR *sc; + +@@ -569,7 +569,7 @@ + if(!s) + s="(null)"; + #endif +- len=strnlen(s, precision); ++ len=strnlen_intern(s, precision); + if(!(flags&LEFT)) + { + while(len<field_width--) +diff -ru arj-3.10.22/gnu/configure.in arj-3.10.22-patched/gnu/configure.in --- arj-3.10.22/gnu/configure.in 2005-06-21 20:27:20.000000000 +0200 -+++ arj-3.10.22-patched/gnu/configure.in 2010-09-28 12:51:48.000000000 +0200 ++++ arj-3.10.22-patched/gnu/configure.in 2011-09-11 18:10:09.000000000 +0200 @@ -94,7 +94,7 @@ case $host_cpu in @@ -224,9 +245,9 @@ AC_SUBST(HAVE_MKDTEMP) AC_SUBST(HAVE_FCLOSEALL) -diff -ruN arj-3.10.22/integr.c arj-3.10.22-patched/integr.c +diff -ru arj-3.10.22/integr.c arj-3.10.22-patched/integr.c --- arj-3.10.22/integr.c 2005-06-21 20:27:18.000000000 +0200 -+++ arj-3.10.22-patched/integr.c 2010-09-28 12:54:23.000000000 +0200 ++++ arj-3.10.22-patched/integr.c 2011-09-11 18:10:09.000000000 +0200 @@ -5,7 +5,7 @@ * */ Index: arj.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/arj.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- arj.info 30 Nov 2010 21:03:09 -0000 1.3 +++ arj.info 12 Sep 2011 12:26:51 -0000 1.4 @@ -16,7 +16,7 @@ Package: arj Version: 3.10.22 -Revision: 2 +Revision: 3 Maintainer: Max Horn <m...@quendi.de> BuildDepends: autoconf (>= 2.60), fink (>= 0.24.12-1) @@ -25,9 +25,10 @@ Source-MD5: f263bf3cf6d42a8b7e85b4fb514336d3 UpdateConfigGuessInDirs: gnu PatchFile: %n.patch -PatchFile-MD5: 05ee532963004772549018007b6b6ccb +PatchFile-MD5: 80479316a9ebcd9c004c022c9c9cb2ad ConfigureParams: --mandir=%p/share/man +UseMaxBuildJobs: false CompileScript: << #!/bin/sh -ev cd gnu @@ -39,7 +40,17 @@ << InstallScript: make install DESTDIR=%d d=.so DLL_FLAGS='-bundle' DocFiles: doc/COPYING -Description: ARJ archiver +Description: Compression utility +DescDetail: << +This package is an open source version of the arj archiver. This version +has been created with the intent to preserve maximum compatibility and +retain the feature set of original ARJ archiver as provided by ARJ +Software, Inc. + +ARJ is a legacy compression format that was in wide-spread use among DOS +and Windows users in the 1990s, and competed back then with the .zip +format of the pkzip tool. +<< DescPackaging: << * Recreate configure script (after fixing configure.in a bit) so that modern day operating systems are detected and supported @@ -47,6 +58,11 @@ * Remove 'static' keyword from intergrity_identifier to prevent the compiler from optimizing the array away. * Fix issues on 64bit systems by adapting a Debian patch. +* Rename 'strnlen' to 'strnlen_intern' to avoid clash with + a system API call on Mac OS X 10.7 +* Add UseMaxBuildJobs to avoid a race condition (various headers + are generated dynamically using 'msgbind', but the build + dependencies to not properly reflect this). << HomePage: http://arj.sourceforge.net/ License: GPL ------------------------------------------------------------------------------ Doing More with Less: The Next Generation Virtual Desktop What are the key obstacles that have prevented many mid-market businesses from deploying virtual desktops? How do next-generation virtual desktops provide companies an easier-to-deploy, easier-to-manage and more affordable virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs