Update of /cvsroot/fink/fink/10.4
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23355
Modified Files:
ChangeLog apt.info apt.patch fink-mirrors.info
Log Message:
sync with stable
Index: fink-mirrors.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/fink-mirrors.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fink-mirrors.info 4 Apr 2009 16:33:59 -0000 1.5
+++ fink-mirrors.info 26 Aug 2009 08:41:18 -0000 1.6
@@ -1,13 +1,13 @@
Package: fink-mirrors
Version: 0.28.7.1
-Revision: 1
+Revision: 2
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: d552d43ab6df48c08d553bb5fcf7b5f0
Depends: fink (>= 0.17.3-1)
Replaces: fink (<< 0.17.2-1)
CompileScript: sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl
-InstallScript: ./install.sh %i
+InstallScript: ./install.sh %i; install -c -p -m 644 postgresql
%i/lib/fink/mirror/
PostInstScript: %p/lib/fink/mirror/postinstall.pl
#
Description: Mirror infrastructure
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apt.patch 9 Dec 2008 06:00:19 -0000 1.4
+++ apt.patch 26 Aug 2009 08:41:18 -0000 1.5
@@ -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
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- apt.info 16 Apr 2009 15:55:05 -0000 1.9
+++ apt.info 26 Aug 2009 08:41:18 -0000 1.10
@@ -1,6 +1,6 @@
Package: apt
Version: 0.5.4
-Revision: 1056
+Revision: 1057
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r)
@@ -8,11 +8,11 @@
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: ff2ae523d9b3ef497cdf7595b6b1dd11
+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
@@ -151,6 +151,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>
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog 23 Aug 2009 05:09:32 -0000 1.30
+++ ChangeLog 26 Aug 2009 08:41:18 -0000 1.31
@@ -1,3 +1,7 @@
+2009-08-26 Dave Morrison <d...@finkproject.org>
+
+ * apt.info, apt.patch, fink-mirrors.info: sync with stable
+
2009-08-23 Dave Morrison <d...@finkproject.org>
* perl588-core-x86_64.info: sync with stable
------------------------------------------------------------------------------
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
