Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv9755/10.7/stable/main/finkinfo/crypto

Added Files:
        arj.info arj.patch 
Log Message:
Add arj to 10.7 tree

--- NEW FILE: arj.patch ---
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      2011-09-11 18:10:09.000000000 +0200
@@ -59,27 +59,27 @@
 #define setup_hput(ptr) (tmp_hptr=(ptr))
 
 #define hget_byte() (*(tmp_hptr++)&0xFF)
-#define hput_byte(c) (*(tmp_hptr++)=(char) (c))
+#define hput_byte(c) (*(tmp_hptr++)=(uint8_t) (c))
 
 /* Reads two bytes from the header, incrementing the pointer */
 
-static unsigned int hget_word()
+static uint16_t hget_word()
 {
- unsigned int result;
+ uint16_t result;
 
  result=mget_word(tmp_hptr);
- tmp_hptr+=sizeof(short);
+ tmp_hptr+=sizeof(uint16_t);
  return result;
 }
 
 /* Reads four bytes from the header, incrementing the pointer */
 
-static unsigned long hget_longword()
+static uint32_t hget_longword()
 {
- unsigned long result;
+ uint32_t result;
 
  result=mget_dword(tmp_hptr);
- tmp_hptr+=sizeof(unsigned long);
+ tmp_hptr+=sizeof(uint32_t);
  return result;
 }
 
@@ -87,18 +87,18 @@
 
 /* Writes two bytes to the header, incrementing the pointer */
 
-static void hput_word(unsigned int w)
+static void hput_word(uint16_t w)
 {
  mput_word(w,tmp_hptr); 
- tmp_hptr+=sizeof(unsigned short);
+ tmp_hptr+=sizeof(uint16_t);
 }
 
 /* Writes four bytes to the header, incrementing the pointer */
 
-static void hput_longword(unsigned long l)
+static void hput_longword(uint32_t l)
 {
  mput_dword(l,tmp_hptr);
- tmp_hptr+=sizeof(unsigned long);
+ tmp_hptr+=sizeof(uint32_t);
 }
 
 /* Calculates and stores the basic header size */
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      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 */
 
-unsigned long get_volfree(unsigned int increment)
+unsigned long get_volfree(unsigned long increment)
 {
  unsigned long pvol;
  unsigned int arjsec_overhead;
@@ -605,7 +605,7 @@
  remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead-
         (long)out_bytes-(long)cpos-(long)ext_voldata-
         MULTIVOLUME_RESERVE-t_volume_offset;
- return((unsigned long)min(remain, (unsigned long)increment));
+ return((unsigned long)min(remain, increment));
 }
 
 /* Performs various checks when multivolume data is packed to predict an
@@ -2466,14 +2466,14 @@
     *tsptr='\0';
   endptr=tsptr;
   tsptr=sptr;
-  while((unsigned int)tsptr<(unsigned int)endptr&&patterns<SEARCH_STR_MAX)
+  while((intptr_t)tsptr<(intptr_t)endptr&&patterns<SEARCH_STR_MAX)
   {
    while(*tsptr=='\0')
     tsptr++;
-   if((unsigned int)tsptr<(unsigned int)endptr)
+   if((intptr_t)tsptr<(intptr_t)endptr)
    {
     search_str[patterns++]=tsptr;
-    while(*tsptr!='\0'&&(unsigned int)tsptr<(unsigned int)endptr)
+    while(*tsptr!='\0'&&(intptr_t)tsptr<(intptr_t)endptr)
      tsptr++;
    }
   }
@@ -2901,9 +2901,9 @@
 #if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
 /* Model-independent routine to get 2 bytes from far RAM */
 
-unsigned int mget_word(char FAR *p)
+uint16_t mget_word(char FAR *p)
 {
- unsigned int b0, b1;
+ uint16_t b0, b1;
 
  b0=mget_byte(p);
  b1=mget_byte(p+1);
@@ -2912,9 +2912,9 @@
 
 /* Model-independent routine to get 4 bytes from far RAM */
 
-unsigned long mget_dword(char FAR *p)
+uint32_t mget_dword(char FAR *p)
 {
- unsigned long w0, w1;
+ uint32_t w0, w1;
 
  w0=mget_word(p);
  w1=mget_word(p+2);
@@ -2923,7 +2923,7 @@
 
 /* Model-independent routine to store 2 bytes in far RAM */
 
-void mput_word(unsigned int w, char FAR *p)
+void mput_word(uint16_t w, char FAR *p)
 {
  mput_byte(w&0xFF, p);
  mput_byte(w>>8  , p+1);
@@ -2931,7 +2931,7 @@
 
 /* Model-independent routine to store 4 bytes in far RAM */
 
-void mput_dword(unsigned long d, char FAR *p)
+void mput_dword(uint32_t d, char FAR *p)
 {
  mput_word(d&0xFFFF, p);
  mput_word(d>>16   , p+2);
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      2011-09-11 18:10:09.000000000 +0200
@@ -8,15 +8,17 @@
 #ifndef ARJ_PROC_INCLUDED
 #define ARJ_PROC_INCLUDED
 
+#include <stdint.h>
+
 /* Helper macros */
 
-#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF)
-#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c)
+#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF)
+#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c)
 #ifndef WORDS_BIGENDIAN
-#define mget_word(p) (*(unsigned short *)(p)&0xFFFF)
-#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w))
-#define mget_dword(p) (*(unsigned long *)(p))
-#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w))
+#define mget_word(p) (*(uint16_t *)(p)&0xFFFF)
+#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w))
+#define mget_dword(p) (*(uint32_t *)(p))
+#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w))
 #endif
 
 /* Prototypes */
@@ -31,7 +33,7 @@
 int translate_path(char *name);
 void restart_proc(char *dest);
 int search_for_extension(char *name, char *ext_list);
-unsigned long get_volfree(unsigned int increment);
+unsigned long get_volfree(unsigned long increment);
 unsigned int check_multivolume(unsigned int increment);
 void store();
 void hollow_encode();
@@ -61,10 +63,10 @@
 void strip_lf(char *str);
 char *ltrim(char *str);
 #ifdef WORDS_BIGENDIAN
-unsigned int mget_word(char FAR *p);
-unsigned long mget_dword(char FAR *p);
-void mput_word(unsigned int w, char FAR *p);
-void mput_dword(unsigned long d, char FAR *p);
+uint16_t mget_word(char FAR *p);
+uint32_t mget_dword(char FAR *p);
+void mput_word(uint16_t w, char FAR *p);
+void mput_dword(uint32_t d, char FAR *p);
 #endif
 
 #endif
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       2011-09-11 18:10:09.000000000 +0200
@@ -58,7 +58,7 @@
   #include <sys/ioctl.h>
   #include <sys/statfs.h>
   #include <sys/statvfs.h>
- #elif defined(__FreeBSD__)||defined(__NetBSD__)
+ #elif defined(__APPLE__)||defined(__NetBSD__)
   #include <sys/param.h>
   #include <sys/mount.h>
  #elif defined(__QNXNTO__)
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        2011-09-11 18:10:09.000000000 
+0200
@@ -94,7 +94,7 @@
 
 case $host_cpu in
 alpha*)
-       AC_DEFINE(ALIGN_POINTERS)
+       AC_DEFINE(ALIGN_POINTERS, 1, [Used by encode.c])
        ;;
 sparc*)
        AC_DEFINE(ALIGN_POINTERS)
@@ -176,7 +176,7 @@
         [color_output=yes],
         [color_output=no])
 AC_MSG_RESULT($color_output)
-test "$color_output" = "yes" && AC_DEFINE(USE_COLORS)
+AC_DEFINE(USE_COLORS, test "$color_output" = "yes", [Enable color output])
 
 AC_SUBST(HAVE_MKDTEMP)
 AC_SUBST(HAVE_FCLOSEALL)
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        2011-09-11 18:10:09.000000000 +0200
@@ -5,7 +5,7 @@
  *
  */
 
-static const char intergrity_identifier[] = {
+const char intergrity_identifier[] = {
        0xB0, 0x03, 0xB0, 0x02, 0xB0, 0x03,
        0xB0, 0x04, 0xB0, 0x05,
        0x90, 0x90, 0x90, 0x90,

--- NEW FILE: arj.info ---
# DISCLAIMER: Max Horn is the sole maintainer of this package.
# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
# Preferably, send a patch to me instead of making changes yourself!
# If that is not possible due to extra urgency, at least send me a mail.
#
# Explanation: I am sick and tired of getting back to my packages and
# discovering that people have messed with it. I am then forced to
# retrace their steps, find out who, when and why did make a certain
# change etc. -- i.e. it makes my life as maintainer harder.
# Furthermore, as maintainer I am responsible for problems caused by my
# packages. But I am not willing to take responsibility for something I
# did not do. In particular, for changes that other people introduced
# behind my back, no matter how good and noble their intentions were. As
# such, I may see myself forced to drop responsibility for (and hence,
# maintainership of) the affected package.

Package: arj
Version: 3.10.22
Revision: 3
Maintainer: Max Horn <m...@quendi.de>

BuildDepends: autoconf (>= 2.60), fink (>= 0.24.12-1)

Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: f263bf3cf6d42a8b7e85b4fb514336d3
UpdateConfigGuessInDirs: gnu
PatchFile: %n.patch
PatchFile-MD5: 80479316a9ebcd9c004c022c9c9cb2ad

ConfigureParams: --mandir=%p/share/man
UseMaxBuildJobs: false
CompileScript: <<
    #!/bin/sh -ev
    cd gnu
    autoheader
    autoconf
    ./configure %c
    cd ..
    make d=.so DLL_FLAGS='-bundle'
<<
InstallScript: make install DESTDIR=%d d=.so DLL_FLAGS='-bundle'
DocFiles: doc/COPYING
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
  correctly.
* 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

Reply via email to