Update of /cvsroot/fink/fink/10.4
In directory vz-cvs-3.sog:/tmp/cvs-serv27731
Modified Files:
ChangeLog apt.info apt.patch perl588-core-x86_64.info
Log Message:
sync a bunch of bug and compiler-pendantics fixes from unstable
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.patch 24 Oct 2010 01:16:23 -0000 1.6
+++ apt.patch 21 May 2011 04:24:18 -0000 1.7
@@ -141,9 +141,36 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
+diff -urN apt-0.5.4.orig/apt-pkg/deb/deblistparser.cc
apt-0.5.4/apt-pkg/deb/deblistparser.cc
+--- apt-0.5.4.orig/apt-pkg/deb/deblistparser.cc 2001-07-26
02:15:59.000000000 -0400
++++ apt-0.5.4/apt-pkg/deb/deblistparser.cc 2011-05-13 03:50:31.000000000
-0400
+@@ -163,18 +163,18 @@
+ /* Strip out any spaces from the text, this undoes dpkgs reformatting
+ of certain fields. dpkg also has the rather interesting notion of
+ reformatting depends operators < -> <= */
+- char *I = S;
++ char *J = S;
+ for (; Start != End; Start++)
+ {
+ if (isspace(*Start) == 0)
+- *I++ = tolower(*Start);
++ *J++ = tolower(*Start);
+ if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
+- *I++ = '=';
++ *J++ = '=';
+ if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
+- *I++ = '=';
++ *J++ = '=';
+ }
+
+- Result = AddCRC16(Result,S,I - S);
++ Result = AddCRC16(Result,S,J - S);
+ }
+
+ return Result;
diff -urN apt-0.5.4.orig/apt-pkg/deb/debsystem.cc
apt-0.5.4/apt-pkg/deb/debsystem.cc
--- apt-0.5.4.orig/apt-pkg/deb/debsystem.cc 2001-04-29 14:13:51.000000000
+0900
-+++ apt-0.5.4/apt-pkg/deb/debsystem.cc 2005-03-08 13:50:12.000000000 +0900
++++ apt-0.5.4/apt-pkg/deb/debsystem.cc 2011-04-29 14:25:17.000000000 -0400
@@ -27,6 +27,109 @@
#include <dirent.h>
#include <errno.h>
@@ -286,7 +313,7 @@
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
-@@ -202,6 +307,44 @@
+@@ -202,6 +307,54 @@
if (StatusFile == 0)
StatusFile = new
debStatusIndex(_config->FindFile("Dir::State::status"));
List.push_back(StatusFile);
@@ -294,13 +321,23 @@
+
+ if (FinkStatusFile == 0) {
+ struct stat unused_sbuf;
-+ int sys_ok=0;
+ unlink(FINKSTATUSFILE);
+ if ( 0 == stat("@PREFIX@/bin/fink-virtual-pkgs",&unused_sbuf)) {
-+ if ( 0 == system("@PREFIX@/bin/fink-virtual-pkgs --apt")) sys_ok=1;
-+ }
-+ if (stat(FINKSTATUSFILE, &unused_sbuf) || !sys_ok) {
-+ std::ofstream finkstatus(FINKSTATUSFILE);
++ // will be trying to use fink's own virtpkg data
++ int have_fvp_data=0;
++ if ( 0 == system("@PREFIX@/bin/fink-virtual-pkgs --apt")) {
++ if (0 == stat(FINKSTATUSFILE, &unused_sbuf)) {
++ // f-v-p did not fail and we have its data-file available
++ have_fvp_data=1;
++ }
++ }
++ if ( !have_fvp_data ) {
++ // f-v-p failed somehow? ABORT!
++ return _error->Error("Error while setting up data-piping from
fink-virtual-pkgs");
++ }
++ } else {
++ // no f-v-p...use dummy data
++ std::ofstream finkstatus(FINKSTATUSFILE);
+ if(macosx_version.version != 0)
+ {
+ finkstatus << "Package: macosx" << endl;
@@ -323,7 +360,7 @@
+ finkstatus << "Description: Pseudo package representing Darwin" << endl;
+ finkstatus << " Pseudo package representing Darwin" << endl << endl;
+ finkstatus.close();
-+ }
++ }
+ FinkStatusFile = new debStatusIndex(FINKSTATUSFILE);
+ }
+ List.push_back(FinkStatusFile);
@@ -331,7 +368,7 @@
return true;
}
/*}}}*/
-@@ -217,6 +360,10 @@
+@@ -217,6 +370,10 @@
{
Found = StatusFile;
return true;
@@ -419,6 +456,18 @@
vector<pkgIndexFile *> Files(List.begin(),List.end());
unsigned long EndOfSource = Files.size();
+diff -urN apt-0.5.4.orig/apt-pkg/pkgcachegen.h apt-0.5.4/apt-pkg/pkgcachegen.h
+--- apt-0.5.4.orig/apt-pkg/pkgcachegen.h 2001-02-20 02:03:17.000000000
-0500
++++ apt-0.5.4/apt-pkg/pkgcachegen.h 2011-05-21 00:01:31.000000000 -0400
+@@ -50,7 +50,7 @@
+ string PkgFileName;
+ pkgCache::PackageFile *CurrentFile;
+
+- bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
++ bool NewPackage(pkgCache::PkgIterator &Pkg,string Name);
+ bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned
long Next);
+
diff -urN apt-0.5.4.orig/apt-pkg/policy.cc apt-0.5.4/apt-pkg/policy.cc
--- apt-0.5.4.orig/apt-pkg/policy.cc 2001-05-28 08:40:56.000000000 +0900
+++ apt-0.5.4/apt-pkg/policy.cc 2005-03-08 13:00:38.000000000 +0900
@@ -703,6 +752,23 @@
{
c1out <<
_("Some packages could not be installed. This may mean that you
have\n"
+@@ -1413,12 +1432,12 @@
+ if ((*Cache)[I].Install() == false)
+ continue;
+
+- const char **J;
+- for (J = CmdL.FileList + 1; *J != 0; J++)
+- if (strcmp(*J,I.Name()) == 0)
++ const char **K;
++ for (K = CmdL.FileList + 1; *K != 0; K++)
++ if (strcmp(*K,I.Name()) == 0)
+ break;
+
+- if (*J == 0)
++ if (*K == 0)
+ List += string(I.Name()) + " ";
+ }
+
@@ -2057,6 +2076,8 @@
_config->Set("APT::Get::Simulate",false);
_config->Set("APT::Get::Assume-Yes",false);
@@ -744,6 +810,18 @@
// Deal with stdout not being a tty
if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+diff -urN apt-0.5.4.orig/cmdline/apt-sortpkgs.cc
apt-0.5.4/cmdline/apt-sortpkgs.cc
+--- apt-0.5.4.orig/cmdline/apt-sortpkgs.cc 2001-02-20 02:03:17.000000000
-0500
++++ apt-0.5.4/cmdline/apt-sortpkgs.cc 2011-05-13 03:38:54.000000000 -0400
+@@ -159,7 +159,7 @@
+ }
+ /*}}}*/
+
+-int main(unsigned int argc,const char *argv[])
++int main(int argc,const char *argv[])
+ {
+ CommandLine::Args Args[] = {
+ {'h',"help","help",0},
diff -urN apt-0.5.4.orig/configure apt-0.5.4/configure
--- apt-0.5.4.orig/configure 2001-08-19 09:46:43.000000000 +0900
+++ apt-0.5.4/configure 2005-03-08 13:00:38.000000000 +0900
Index: perl588-core-x86_64.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/perl588-core-x86_64.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- perl588-core-x86_64.info 23 Aug 2009 05:09:32 -0000 1.4
+++ perl588-core-x86_64.info 21 May 2011 04:24:18 -0000 1.5
@@ -1,6 +1,6 @@
Package: perl588-core
Version: 5.8.8
-Revision: 7
+Revision: 8
Distribution: 10.5
Architecture: x86_64
Essential: true
@@ -28,6 +28,7 @@
instead of #!/usr/bin/perl .
Disabled 'make test' on intel, since it doesn't work.
+
Because the perl build system is designed to download source files for
"extra" perlmodules directly from CPAN, we do not include those "extra"
perlmodules in this package. For that reason, the following packages
@@ -50,7 +51,7 @@
Source-MD5: b8c118d4360846829beb30b02a6b91a7
CompileScript: <<
#! /bin/sh -ev
- sh Configure -des -Dcc="gcc-4.0 -arch x86_64" -Dcpp="gcc-4.0 -E" -Dprefix=%p
-Dccflags=-I%p/include -Dldflags=-L%p/lib -Dperladmin=none -Uinstallusrbinperl
-Dprivlib="%p/lib/perl5-core/5.8.8"
-Darchlib="%p/lib/perl5-core/5.8.8/darwin-thread-multi-2level"
-Dman1dir="%p/share/man/man1" -Dman3dir="%p/lib/perl5-core/5.8.8/man/man3"
-Dman3ext=3pm -Duseithreads
-Dinc_version_list="5.8.8/darwin-thread-multi-2level
5.8.6/darwin-thread-multi-2level 5.8.1 5.8.0 5.6.0"
-Adefine:startperl="#!%p/bin/perl5.8.8"
+ sh Configure -des -Dcc="gcc-4.0 -arch x86_64" -Dcpp="gcc-4.0 -E" -Dprefix=%p
-Dccflags=-I%p/include -Dldflags=-L%p/lib -Dperladmin=none -Uinstallusrbinperl
-Dprivlib="%p/lib/perl5-core/5.8.8"
-Darchlib="%p/lib/perl5-core/5.8.8/darwin-thread-multi-2level"
-Dman1dir="%p/share/man/man1" -Dman3dir="%p/lib/perl5-core/5.8.8/man/man3"
-Dman3ext=3pm -Duseithreads
-Dinc_version_list="5.8.8/darwin-thread-multi-2level
5.8.6/darwin-thread-multi-2level 5.8.1 5.8.0 5.6.0"
-Adefine:startperl="#!%p/bin/perl5.8.8" -Adefine:perlpath="%p/bin/perl5.8.8"
make
if [ "%m" == "powerpc" ]; then make test ; fi
<<
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- apt.info 24 Oct 2010 01:16:23 -0000 1.11
+++ apt.info 21 May 2011 04:24:18 -0000 1.12
@@ -1,6 +1,6 @@
Package: apt
Version: 0.5.4
-Revision: 1058
+Revision: 1060
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r)
@@ -8,7 +8,7 @@
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: df6c8dfea788fb82752784b30ee70150
+PatchFile-MD5: 6b83d9ba0b19aa525de8f39603938c97
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1
sh patch_flush
@@ -148,6 +148,8 @@
(first appears in: 10.2-gcc3.3/0.5.4-41, 10.3/0.5.4-51)
Patch extracttar.cc so it understands negative UIDs, such as -2 for 'nobody'.
+
+ Fix some variable type collisions (jhowarth and upstream).
<<
DescPackaging: <<
Previous versions by Christoph Pfisterer.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog 12 May 2011 00:42:36 -0000 1.36
+++ ChangeLog 21 May 2011 04:24:18 -0000 1.37
@@ -1,3 +1,7 @@
+2011-05-21 Daniel Macks <dma...@netspace.org>
+
+ * apt.info, apt.patch, perl588-core-x86_64.info: sync with unstable
+
2011-05-11 Daniel Macks <dma...@netspace.org>
* ncurses.info: new version from unstable that has upstream fix
@@ -17,9 +21,9 @@
2010-10-23 Dave Morrison <d...@finkproject.org>
- * apt.info, apt.patch, base-files.info, bzip2.info, debianutils.info,
- * fink-mirrors.info, gzip.info, libgettext3-shlibs.info,
- * libiconv.info, ncurses.info, tar.info, unzip.info, unzip-10.4.info:
+ * apt.info, apt.patch, base-files.info, bzip2.info, debianutils.info,
+ * fink-mirrors.info, gzip.info, libgettext3-shlibs.info,
+ * libiconv.info, ncurses.info, tar.info, unzip.info, unzip-10.4.info:
sync with stable
2009-08-26 Dave Morrison <d...@finkproject.org>
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
