Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27736
Modified Files:
apt.info apt.patch
Log Message:
latest version to stable
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/apt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apt.patch 15 Aug 2006 10:55:48 -0000 1.3
+++ apt.patch 24 Aug 2009 07:16:59 -0000 1.4
@@ -571,7 +571,7 @@
.* unknown
diff -urN apt-0.5.4.orig/cmdline/apt-cache.cc apt-0.5.4/cmdline/apt-cache.cc
--- apt-0.5.4.orig/cmdline/apt-cache.cc 2001-07-02 09:10:32.000000000
+0900
-+++ apt-0.5.4/cmdline/apt-cache.cc 2005-03-08 13:00:38.000000000 +0900
++++ apt-0.5.4/cmdline/apt-cache.cc 2009-05-16 03:26:33.000000000 -0400
@@ -374,8 +374,10 @@
if (ReadPinFile(Plcy) == false)
return false;
@@ -594,6 +594,15 @@
// Iterate over all the package files and write them out.
char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10];
+@@ -1361,7 +1363,7 @@
+
+ if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() ==
false)
+ {
+- MMap *Map;
++ MMap *Map = 0;
+ if (_config->FindB("APT::Cache::Generate",true) == false)
+ {
+ Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"),
diff -urN apt-0.5.4.orig/cmdline/apt-get.cc apt-0.5.4/cmdline/apt-get.cc
--- apt-0.5.4.orig/cmdline/apt-get.cc 2001-07-02 07:59:04.000000000 +0900
+++ apt-0.5.4/cmdline/apt-get.cc 2005-03-08 13:00:38.000000000 +0900
@@ -1199,3 +1208,18 @@
StrToNum(Tar->Size,Itm.Size,sizeof(Tar->Size),8) == false ||
StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false ||
StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
+--- apt-0.5.4/apt-pkg/contrib/system.h~ 1999-12-10 17:40:29.000000000
-0600
++++ apt-0.5.4/apt-pkg/contrib/system.h 2008-12-08 00:45:25.000000000 -0600
+@@ -25,12 +25,6 @@
+ #define MAX(x,y) _max(x,y)
+ #endif
+
+-// GNU C++ has a min/max operator <coolio>
+-#if defined(__GNUG__)
+-#define MIN(A,B) ((A) <? (B))
+-#define MAX(A,B) ((A) >? (B))
+-#endif
+-
+ /* Templates tend to mess up existing code that uses min/max because of the
+ strict matching requirements */
+ #if !defined(MIN)
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/apt.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.info 10 Jun 2007 06:01:38 -0000 1.6
+++ apt.info 24 Aug 2009 07:16:59 -0000 1.7
@@ -1,6 +1,9 @@
Package: apt
+
Version: 0.5.4
-Revision: 1054
+Revision: 1057
+# DO NOT SEND THIS UPDATE TO STABLE UNTIL fink-0.29.7 MOVES TO STABLE
+
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r)
@@ -8,15 +11,17 @@
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 8b8703dd6ebf6202470e86055cf6f305
+PatchFile-MD5: 918f4b0a4170277ea8f095eebc631ced
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1
sh patch_flush
- for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
+ for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
+ echo "x86_64\tx86_64" >> %b/buildlib/archtable
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings
-DHAVE_SOCKLEN_T=1
+ConfigureParams: --host=%m-apple-darwin`uname -r|cut -f1 -d.`
CompileScript: <<
./configure %c
make -f makefile.wrap NOISY=1
@@ -149,6 +154,9 @@
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer.
+
+ Don't seg-fault if *Packages file isn't readable (or other
+ malformed data). Upstream patch to fix upstream Bug #120311
<<
License: GPL
Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
