Update of /cvsroot/fink/experimental/dazjorz/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv31853

Modified Files:
        apt.info apt.patch 
Log Message:
Set VERSIONER_PERL_PREFER_32_BIT to "yes" or "no" in apt depending on the value 
in the apt build script. This fixes Perl in fink-virtual-pkgs load the Fink 
modules, so it can detect stuff. Earlier, it would only return a hardcoded 
darwin and macosx response; this fixes Apt not detecting stuff like x11 and 
system-java and wanting to remove a lot of packages...


Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/apt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apt.patch   7 Jun 2011 15:43:39 -0000       1.4
+++ apt.patch   26 Jul 2011 10:07:03 -0000      1.5
@@ -1,6 +1,6 @@
 diff -Nurd apt-0.7.25.3/apt-inst/contrib/extracttar.cc 
apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc
 --- apt-0.7.25.3/apt-inst/contrib/extracttar.cc        2010-02-01 
20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc        2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc        2011-07-26 
11:02:34.000000000 +0200
 @@ -148,6 +148,18 @@
     return true;
  }
@@ -33,7 +33,7 @@
          StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
 diff -Nurd apt-0.7.25.3/apt-inst/deb/dpkgdb.cc 
apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc
 --- apt-0.7.25.3/apt-inst/deb/dpkgdb.cc        2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc        2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc        2011-07-26 
11:02:34.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <errno.h>
  #include <sys/stat.h>
@@ -44,7 +44,7 @@
  #include <ctype.h>
 diff -Nurd apt-0.7.25.3/apt-pkg/aptconfiguration.cc 
apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc
 --- apt-0.7.25.3/apt-pkg/aptconfiguration.cc   2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc   2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc   2011-07-26 
11:02:34.000000000 +0200
 @@ -36,8 +36,8 @@
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
  
@@ -58,8 +58,8 @@
        std::string const overrideOrder = 
_config->Find("Acquire::CompressionTypes::Order","");
 diff -Nurd apt-0.7.25.3/apt-pkg/contrib/fink.cc 
apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc
 --- apt-0.7.25.3/apt-pkg/contrib/fink.cc       1970-01-01 01:00:00.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc       2011-06-07 
17:08:38.000000000 +0200
-@@ -0,0 +1,84 @@
++++ apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc       2011-07-26 
11:46:28.000000000 +0200
+@@ -0,0 +1,87 @@
 +/* FINK LOCAL begin */
 +#include <sys/utsname.h>
 +#include <CoreFoundation/CoreFoundation.h>
@@ -133,6 +133,9 @@
 +  /* Finally link the buffer into the macosx_version struct. */
 +  macosx_version.version = buffer;
 +  
++  /* Set Perl versioning architecture for fink-virtual-pkgs script. */
++  setenv("VERSIONER_PERL_PREFER_32_BIT","@PERLARCH32@", 1);
++
 +BAIL:
 +  // Release all of the CF objects we're responsible for.
 +  if (fileURL)
@@ -146,7 +149,7 @@
 +/* FINK LOCAL end */
 diff -Nurd apt-0.7.25.3/apt-pkg/contrib/macros.h 
apt-0.7.25.3-patched/apt-pkg/contrib/macros.h
 --- apt-0.7.25.3/apt-pkg/contrib/macros.h      2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/macros.h      2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/macros.h      2011-07-26 
11:02:34.000000000 +0200
 @@ -24,12 +24,6 @@
  #define MAX(x,y) _max(x,y)
  #endif
@@ -172,7 +175,7 @@
          #define likely(x)       __builtin_expect (!!(x), 1)
 diff -Nurd apt-0.7.25.3/apt-pkg/contrib/mmap.cc 
apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc
 --- apt-0.7.25.3/apt-pkg/contrib/mmap.cc       2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc       2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc       2011-07-26 
11:02:34.000000000 +0200
 @@ -172,6 +172,13 @@
        return;
  
@@ -189,7 +192,7 @@
     int Map = MAP_PRIVATE | MAP_ANONYMOUS;
 diff -Nurd apt-0.7.25.3/apt-pkg/contrib/netrc.cc 
apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc
 --- apt-0.7.25.3/apt-pkg/contrib/netrc.cc      2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc      2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc      2011-07-26 
11:02:34.000000000 +0200
 @@ -160,10 +160,18 @@
      {
        char login[64] = "";
@@ -236,7 +239,7 @@
  }
 diff -Nurd apt-0.7.25.3/apt-pkg/deb/debsystem.cc 
apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc
 --- apt-0.7.25.3/apt-pkg/deb/debsystem.cc      2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc      2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc      2011-07-26 
11:50:28.000000000 +0200
 @@ -23,6 +23,12 @@
  #include <unistd.h>
  #include <dirent.h>
@@ -357,7 +360,7 @@
     return false;
 diff -Nurd apt-0.7.25.3/apt-pkg/deb/debsystem.h 
apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h
 --- apt-0.7.25.3/apt-pkg/deb/debsystem.h       2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h       2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h       2011-07-26 
11:02:34.000000000 +0200
 @@ -12,6 +12,19 @@
  
  #include <apt-pkg/pkgsystem.h>
@@ -388,7 +391,7 @@
  
 diff -Nurd apt-0.7.25.3/apt-pkg/deb/dpkgpm.cc 
apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc
 --- apt-0.7.25.3/apt-pkg/deb/dpkgpm.cc 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc 2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc 2011-07-26 11:02:34.000000000 
+0200
 @@ -22,6 +22,7 @@
  #include <sys/select.h>
  #include <sys/types.h>
@@ -445,7 +448,7 @@
  
 diff -Nurd apt-0.7.25.3/apt-pkg/indexcopy.cc 
apt-0.7.25.3-patched/apt-pkg/indexcopy.cc
 --- apt-0.7.25.3/apt-pkg/indexcopy.cc  2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/indexcopy.cc  2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/apt-pkg/indexcopy.cc  2011-07-26 11:02:34.000000000 
+0200
 @@ -603,8 +603,8 @@
        const char *Args[400];
        unsigned int i = 0;
@@ -459,7 +462,7 @@
  
 diff -Nurd apt-0.7.25.3/apt-pkg/init.cc apt-0.7.25.3-patched/apt-pkg/init.cc
 --- apt-0.7.25.3/apt-pkg/init.cc       2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/init.cc       2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/apt-pkg/init.cc       2011-07-26 11:02:34.000000000 
+0200
 @@ -16,6 +16,8 @@
  #include <config.h>
  #include <cstdlib>
@@ -498,7 +501,7 @@
     if (Label.empty() == false)
 diff -Nurd apt-0.7.25.3/apt-pkg/makefile apt-0.7.25.3-patched/apt-pkg/makefile
 --- apt-0.7.25.3/apt-pkg/makefile      2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/makefile      2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/apt-pkg/makefile      2011-07-26 11:02:34.000000000 
+0200
 @@ -22,7 +22,7 @@
           contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
         contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
@@ -510,7 +513,7 @@
          macros.h
 diff -Nurd apt-0.7.25.3/apt-pkg/pkgcachegen.cc 
apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc
 --- apt-0.7.25.3/apt-pkg/pkgcachegen.cc        2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc        2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc        2011-07-26 
11:02:34.000000000 +0200
 @@ -827,7 +827,7 @@
                        MMap **OutMap,bool AllowMem)
  {
@@ -522,7 +525,7 @@
     for (vector<metaIndex *>::const_iterator i = List.begin();
 diff -Nurd apt-0.7.25.3/buildlib/configure.mak 
apt-0.7.25.3-patched/buildlib/configure.mak
 --- apt-0.7.25.3/buildlib/configure.mak        2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/buildlib/configure.mak        2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/configure.mak        2011-07-26 
11:02:34.000000000 +0200
 @@ -28,7 +28,7 @@
        aclocal -I buildlib
        
@@ -534,7 +537,7 @@
  $(addprefix $(BUILDDIR)/,$(CONVERTED)):
 diff -Nurd apt-0.7.25.3/buildlib/environment.mak.in 
apt-0.7.25.3-patched/buildlib/environment.mak.in
 --- apt-0.7.25.3/buildlib/environment.mak.in   2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/buildlib/environment.mak.in   2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/environment.mak.in   2011-07-26 
11:02:34.000000000 +0200
 @@ -11,8 +11,8 @@
  NUM_PROCS = @NUM_PROCS@
  
@@ -569,7 +572,7 @@
 +LFLAGS_SO=-dynamiclib 
 diff -Nurd apt-0.7.25.3/buildlib/library.mak 
apt-0.7.25.3-patched/buildlib/library.mak
 --- apt-0.7.25.3/buildlib/library.mak  2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/buildlib/library.mak  2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/buildlib/library.mak  2011-07-26 11:02:34.000000000 
+0200
 @@ -16,11 +16,11 @@
  # See defaults.mak for information about LOCAL
  
@@ -626,7 +629,7 @@
  
 diff -Nurd apt-0.7.25.3/buildlib/libversion.mak 
apt-0.7.25.3-patched/buildlib/libversion.mak
 --- apt-0.7.25.3/buildlib/libversion.mak       2010-02-01 20:44:40.000000000 
+0100
-+++ apt-0.7.25.3-patched/buildlib/libversion.mak       2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/libversion.mak       2011-07-26 
11:02:34.000000000 +0200
 @@ -18,4 +18,5 @@
  # want to drop this, but this a ABI break.
  # And we don't want to do this now. So we hardcode a value here,
@@ -636,7 +639,7 @@
 +LIBEXT=
 diff -Nurd apt-0.7.25.3/cmdline/apt-get.cc 
apt-0.7.25.3-patched/cmdline/apt-get.cc
 --- apt-0.7.25.3/cmdline/apt-get.cc    2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/cmdline/apt-get.cc    2011-06-07 17:33:24.000000000 
+0200
++++ apt-0.7.25.3-patched/cmdline/apt-get.cc    2011-07-26 11:02:34.000000000 
+0200
 @@ -53,7 +53,12 @@
  #include <termios.h>
  #include <sys/ioctl.h>
@@ -801,7 +804,7 @@
        _config->Set("quiet","1");
 diff -Nurd apt-0.7.25.3/cmdline/apt-key apt-0.7.25.3-patched/cmdline/apt-key
 --- apt-0.7.25.3/cmdline/apt-key       2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/cmdline/apt-key       2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/cmdline/apt-key       2011-07-26 11:02:34.000000000 
+0200
 @@ -5,7 +5,7 @@
  
  # We don't use a secret keyring, of course, but gpg panics and
@@ -828,7 +831,7 @@
                for trusted in $(run-parts --list $TRUSTEDPARTS --regex 
'^.*\.gpg$'); do
 diff -Nurd apt-0.7.25.3/debian/bugscript apt-0.7.25.3-patched/debian/bugscript
 --- apt-0.7.25.3/debian/bugscript      2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/debian/bugscript      2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/debian/bugscript      2011-07-26 11:02:34.000000000 
+0200
 @@ -11,14 +11,14 @@
  
  EOF
@@ -848,7 +851,7 @@
      if [ "$REPLY" = "yep" ]; then
 diff -Nurd apt-0.7.25.3/doc/apt-get.8.xml 
apt-0.7.25.3-patched/doc/apt-get.8.xml
 --- apt-0.7.25.3/doc/apt-get.8.xml     2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/apt-get.8.xml     2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/doc/apt-get.8.xml     2011-07-26 11:02:34.000000000 
+0200
 @@ -344,6 +344,19 @@
       Configuration Item: 
<literal>APT::Get::Fix-Broken</literal>.</para></listitem>
       </varlistentry>
@@ -871,7 +874,7 @@
       <listitem><para>Ignore missing packages; If packages cannot be retrieved 
or fail the    
 diff -Nurd apt-0.7.25.3/doc/examples/apt-https-method-example.conf 
apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf
 --- apt-0.7.25.3/doc/examples/apt-https-method-example.conf    2010-02-01 
20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf    
2011-06-07 17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf    
2011-07-26 11:02:34.000000000 +0200
 @@ -59,11 +59,15 @@
  // server certificate using its cert.
  Acquire::https::secure.dom1.tld::CaInfo     "/etc/apt/certs/ca-dom1-crt.pem";
@@ -908,7 +911,7 @@
  
 diff -Nurd apt-0.7.25.3/doc/manpage-style.xsl 
apt-0.7.25.3-patched/doc/manpage-style.xsl
 --- apt-0.7.25.3/doc/manpage-style.xsl 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/manpage-style.xsl 2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/doc/manpage-style.xsl 2011-07-26 11:02:34.000000000 
+0200
 @@ -2,7 +2,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
   version="1.0">
@@ -920,7 +923,7 @@
  
 diff -Nurd apt-0.7.25.3/dselect/install apt-0.7.25.3-patched/dselect/install
 --- apt-0.7.25.3/dselect/install       2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/install       2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/dselect/install       2011-07-26 11:02:34.000000000 
+0200
 @@ -6,8 +6,8 @@
  # Get the configuration from /etc/apt/apt.conf
  CLEAN="prompt"
@@ -934,7 +937,7 @@
  APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
 diff -Nurd apt-0.7.25.3/dselect/setup apt-0.7.25.3-patched/dselect/setup
 --- apt-0.7.25.3/dselect/setup 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/setup 2011-06-07 17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/dselect/setup 2011-07-26 11:02:34.000000000 +0200
 @@ -23,15 +23,20 @@
  my $vardir=$ARGV[0];
  my $method=$ARGV[1];
@@ -1011,7 +1014,7 @@
      $answer =~ s/\s+/ /og;
 diff -Nurd apt-0.7.25.3/dselect/update apt-0.7.25.3-patched/dselect/update
 --- apt-0.7.25.3/dselect/update        2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/update        2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/dselect/update        2011-07-26 11:02:34.000000000 
+0200
 @@ -7,13 +7,13 @@
  # Get the configuration from /etc/apt/apt.conf
  CLEAN="prompt"
@@ -1032,7 +1035,7 @@
                      DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
 diff -Nurd apt-0.7.25.3/fink/fink_unauthenticated.conf 
apt-0.7.25.3-patched/fink/fink_unauthenticated.conf
 --- apt-0.7.25.3/fink/fink_unauthenticated.conf        1970-01-01 
01:00:00.000000000 +0100
-+++ apt-0.7.25.3-patched/fink/fink_unauthenticated.conf        2011-06-07 
17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/fink/fink_unauthenticated.conf        2011-07-26 
11:02:34.000000000 +0200
 @@ -0,0 +1,9 @@
 +# Fink's apt was updated in may 2010. It now features cryptographic signing of
 +# packages, but Fink doesn't do this at all yet. In order to have a clean
@@ -1045,7 +1048,7 @@
 +}
 diff -Nurd apt-0.7.25.3/methods/connect.cc 
apt-0.7.25.3-patched/methods/connect.cc
 --- apt-0.7.25.3/methods/connect.cc    2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/connect.cc    2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/methods/connect.cc    2011-07-26 11:02:34.000000000 
+0200
 @@ -107,7 +107,7 @@
  
     // Check the socket for an error condition
@@ -1057,7 +1060,7 @@
     
 diff -Nurd apt-0.7.25.3/methods/ftp.cc apt-0.7.25.3-patched/methods/ftp.cc
 --- apt-0.7.25.3/methods/ftp.cc        2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/ftp.cc        2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/methods/ftp.cc        2011-07-26 11:02:34.000000000 
+0200
 @@ -703,7 +703,7 @@
        if (WaitFd(DataFd,true,TimeOut) == false)
         return _error->Error(_("Could not connect data socket, connection 
timed out"));
@@ -1069,7 +1072,7 @@
        if (Err != 0)
 diff -Nurd apt-0.7.25.3/methods/gpgv.cc apt-0.7.25.3-patched/methods/gpgv.cc
 --- apt-0.7.25.3/methods/gpgv.cc       2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/gpgv.cc       2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/methods/gpgv.cc       2011-07-26 11:02:34.000000000 
+0200
 @@ -59,8 +59,8 @@
     string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
     // FIXME: remove support for deprecated APT::GPGV setting
@@ -1083,7 +1086,7 @@
        std::clog << "gpgv path: " << gpgvpath << std::endl;
 diff -Nurd apt-0.7.25.3/methods/https.cc apt-0.7.25.3-patched/methods/https.cc
 --- apt-0.7.25.3/methods/https.cc      2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/https.cc      2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/methods/https.cc      2011-07-26 11:02:34.000000000 
+0200
 @@ -151,12 +151,14 @@
        default_verify = 0;
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
@@ -1116,7 +1119,7 @@
     if(_config->FindB("Acquire::https::No-Cache",
 diff -Nurd apt-0.7.25.3/methods/rfc2553emu.h 
apt-0.7.25.3-patched/methods/rfc2553emu.h
 --- apt-0.7.25.3/methods/rfc2553emu.h  2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/rfc2553emu.h  2011-06-07 17:08:38.000000000 
+0200
++++ apt-0.7.25.3-patched/methods/rfc2553emu.h  2011-07-26 11:02:34.000000000 
+0200
 @@ -26,6 +26,11 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -1150,7 +1153,7 @@
  #endif
 diff -Nurd apt-0.7.25.3/patch_flush apt-0.7.25.3-patched/patch_flush
 --- apt-0.7.25.3/patch_flush   1970-01-01 01:00:00.000000000 +0100
-+++ apt-0.7.25.3-patched/patch_flush   2011-06-07 17:08:38.000000000 +0200
++++ apt-0.7.25.3-patched/patch_flush   2011-07-26 11:02:34.000000000 +0200
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +set -e

Index: apt.info
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/apt.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.info    7 Jun 2011 15:43:39 -0000       1.6
+++ apt.info    26 Jul 2011 10:07:03 -0000      1.7
@@ -8,9 +8,9 @@
 Source-MD5: ee59a90b91764aefeb5eb0f29d5cab96
 SourceDirectory: %n-%v
 PatchFile: %n.patch
-PatchFile-MD5: a6328a695e00f56dd44d9db7c3f5822d
+PatchFile-MD5: 6080319dbba1cf626b1e1759d4472e17
 PatchScript: <<
- sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ sed -e 's|@PREFIX@|%p|g' -e "s|@PERLARCH32@|$VERSIONER_PERL_PREFER_32_BIT|" < 
%{PatchFile} | patch -p1
  sh patch_flush
  perl -pi -e 's|/usr|%p|g' doc/*.8.xml
  for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi -e 's/#ifdef 
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
@@ -175,7 +175,11 @@
 domain implementation. sighandler_t is called sig_t on Mac.
 
 This apt package includes a forward-ported patch by dmacks which improves
-fink-virtual-pkg reading in apt.
+fink-virtual-pkg reading in apt. Also, added to the patch is included a change
+to set a VERSIONER_PERL_PREFER_32_BIT environment variable, normally set in
+users' environments but removed by 'sudo'. It is required for perl in
+fink-virtual-pkgs to load the modules in the correct architecture, or the
+script will be unable to load Fink to detect anything.
 <<
 DescPackaging: <<
 Previous versions by Christoph Pfisterer. Version 0.7.25.3 by Sjors Gielen.


------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to