Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base In directory vz-cvs-3.sog:/tmp/cvs-serv17465
Modified Files: apt.info apt.patch Log Message: functional and security fixes for piping data from fink-virutal-packages Index: apt.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/apt.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- apt.patch 6 Dec 2009 19:11:20 -0000 1.6 +++ apt.patch 30 Apr 2011 16:23:19 -0000 1.7 @@ -143,7 +143,7 @@ +} 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 +286,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 +294,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 +333,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 +341,7 @@ return true; } /*}}}*/ -@@ -217,6 +360,10 @@ +@@ -217,6 +370,10 @@ { Found = StatusFile; return true; Index: apt.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/apt.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- apt.info 6 Dec 2009 19:11:20 -0000 1.13 +++ apt.info 30 Apr 2011 16:23:19 -0000 1.14 @@ -1,6 +1,6 @@ Package: apt Version: 0.5.4 -Revision: 1058 +Revision: 1059 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: 26a144015d988b0bd8da718e9056c164 PatchScript: << sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1 sh patch_flush ------------------------------------------------------------------------------ WhatsUp Gold - Download Free Network Management Software The most intuitive, comprehensive, and cost-effective network management toolset available today. Delivers lowest initial acquisition cost and overall TCO of any competing solution. http://p.sf.net/sfu/whatsupgold-sd _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs