Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv631
Modified Files:
apt.info apt.patch
Log Message:
Minimize differences vs. 10.4T pkg, without making any functional changes.
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/apt.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.patch 12 Oct 2004 19:21:10 -0000 1.6
+++ apt.patch 22 Jun 2005 18:34:20 -0000 1.7
@@ -1,6 +1,6 @@
-diff -ruN apt-0.5.4/apt-inst/makefile apt-0.5.4-patched/apt-inst/makefile
---- apt-0.5.4/apt-inst/makefile Mon Feb 26 23:16:05 2001
-+++ apt-0.5.4-patched/apt-inst/makefile Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-inst/makefile apt-0.5.4/apt-inst/makefile
+--- apt-0.5.4.orig/apt-inst/makefile 2001-02-27 13:16:05.000000000 +0900
++++ apt-0.5.4/apt-inst/makefile 2005-03-08 13:00:37.000000000 +0900
@@ -10,6 +10,7 @@
include ../buildlib/defaults.mak
@@ -9,9 +9,9 @@
LIBRARY=apt-inst
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
MAJOR=1.0
-diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.cc
apt-0.5.4-patched/apt-pkg/contrib/mmap.cc
---- apt-0.5.4/apt-pkg/contrib/mmap.cc Sun May 27 01:19:30 2001
-+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.cc Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/contrib/mmap.cc
apt-0.5.4/apt-pkg/contrib/mmap.cc
+--- apt-0.5.4.orig/apt-pkg/contrib/mmap.cc 2001-05-27 14:19:30.000000000
+0900
++++ apt-0.5.4/apt-pkg/contrib/mmap.cc 2005-03-08 13:00:37.000000000 +0900
@@ -41,7 +41,7 @@
// ---------------------------------------------------------------------
/* */
@@ -89,7 +89,7 @@
return true;
}
/*}}}*/
-@@ -133,11 +153,13 @@
+@@ -133,12 +153,14 @@
if ((Flags & UnMapped) == UnMapped)
return true;
@@ -99,13 +99,14 @@
if ((Flags & ReadOnly) != ReadOnly)
if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC)
!= 0)
return _error->Errno("msync","Unable to write mmap");
-+#endif
#endif
++#endif
return true;
}
-diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.h
apt-0.5.4-patched/apt-pkg/contrib/mmap.h
---- apt-0.5.4/apt-pkg/contrib/mmap.h Mon May 14 01:16:43 2001
-+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.h Sun Nov 9 14:02:47 2003
+ /*}}}*/
+diff -urN apt-0.5.4.orig/apt-pkg/contrib/mmap.h
apt-0.5.4/apt-pkg/contrib/mmap.h
+--- apt-0.5.4.orig/apt-pkg/contrib/mmap.h 2001-05-14 14:16:43.000000000
+0900
++++ apt-0.5.4/apt-pkg/contrib/mmap.h 2005-03-08 13:00:38.000000000 +0900
@@ -46,6 +46,7 @@
unsigned long Flags;
unsigned long iSize;
@@ -114,9 +115,9 @@
bool Map(FileFd &Fd);
bool Close(bool DoSync = true);
-diff -ruN apt-0.5.4/apt-pkg/deb/debindexfile.cc
apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc
---- apt-0.5.4/apt-pkg/deb/debindexfile.cc Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/deb/debindexfile.cc
apt-0.5.4/apt-pkg/deb/debindexfile.cc
+--- apt-0.5.4.orig/apt-pkg/deb/debindexfile.cc 2001-04-29 14:13:51.000000000
+0900
++++ apt-0.5.4/apt-pkg/deb/debindexfile.cc 2005-03-08 13:00:38.000000000
+0900
@@ -505,3 +505,11 @@
}
@@ -129,10 +130,10 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
-diff -ruN apt-0.5.4/apt-pkg/deb/debsystem.cc
apt-0.5.4-patched/apt-pkg/deb/debsystem.cc
---- apt-0.5.4/apt-pkg/deb/debsystem.cc Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-patched/apt-pkg/deb/debsystem.cc Sun Nov 9 14:02:47 2003
-@@ -27,6 +27,108 @@
+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
+@@ -27,6 +27,109 @@
#include <dirent.h>
#include <errno.h>
/*}}}*/
@@ -203,7 +204,8 @@
+ goto BAIL;
+
+ /* Try to read the system version from it. */
-+ status = CFDictionaryGetValueIfPresent( propertyList,
++ status = CFDictionaryGetValueIfPresent(
++ propertyList,
+ CFSTR("ProductVersion"),
+ (void*)&string);
+ if (!status)
@@ -241,7 +243,7 @@
debSystem debSys;
-@@ -48,6 +150,8 @@
+@@ -48,6 +151,8 @@
debSystem::~debSystem()
{
delete StatusFile;
@@ -250,7 +252,7 @@
}
/*}}}*/
// System::Lock - Get the lock
/*{{{*/
-@@ -161,8 +265,8 @@
+@@ -161,8 +266,8 @@
which is yet to be determined. The functions in pkgcachegen should
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
@@ -261,7 +263,7 @@
return true;
}
-@@ -185,9 +289,9 @@
+@@ -185,9 +290,9 @@
signed debSystem::Score(Configuration const &Cnf)
{
signed Score = 0;
@@ -273,7 +275,7 @@
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
-@@ -202,6 +306,44 @@
+@@ -202,6 +307,44 @@
if (StatusFile == 0)
StatusFile = new
debStatusIndex(_config->FindFile("Dir::State::status"));
List.push_back(StatusFile);
@@ -318,20 +320,20 @@
return true;
}
/*}}}*/
-@@ -216,6 +358,10 @@
- if (StatusFile->FindInCache(*File.Cache()) == File)
+@@ -217,6 +360,10 @@
{
Found = StatusFile;
-+ return true;
+ return true;
+ } else if ((FinkStatusFile != 0) &&
(FinkStatusFile->FindInCache(*File.Cache()) == File))
+ {
+ Found = FinkStatusFile;
- return true;
++ return true;
}
-diff -ruN apt-0.5.4/apt-pkg/deb/debsystem.h
apt-0.5.4-patched/apt-pkg/deb/debsystem.h
---- apt-0.5.4/apt-pkg/deb/debsystem.h Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-patched/apt-pkg/deb/debsystem.h Sun Nov 9 14:02:47 2003
+ return false;
+diff -urN apt-0.5.4.orig/apt-pkg/deb/debsystem.h
apt-0.5.4/apt-pkg/deb/debsystem.h
+--- apt-0.5.4.orig/apt-pkg/deb/debsystem.h 2001-04-29 14:13:51.000000000
+0900
++++ apt-0.5.4/apt-pkg/deb/debsystem.h 2005-03-08 13:00:38.000000000 +0900
@@ -25,6 +25,7 @@
bool CheckUpdates();
@@ -340,9 +342,9 @@
public:
-diff -ruN apt-0.5.4/apt-pkg/deb/debversion.cc
apt-0.5.4-patched/apt-pkg/deb/debversion.cc
---- apt-0.5.4/apt-pkg/deb/debversion.cc Mon May 7 01:14:53 2001
-+++ apt-0.5.4-patched/apt-pkg/deb/debversion.cc Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/deb/debversion.cc
apt-0.5.4/apt-pkg/deb/debversion.cc
+--- apt-0.5.4.orig/apt-pkg/deb/debversion.cc 2001-05-07 14:14:53.000000000
+0900
++++ apt-0.5.4/apt-pkg/deb/debversion.cc 2005-03-08 13:00:38.000000000
+0900
@@ -24,6 +24,11 @@
debVersioningSystem debVS;
@@ -355,9 +357,9 @@
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-diff -ruN apt-0.5.4/apt-pkg/init.cc apt-0.5.4-patched/apt-pkg/init.cc
---- apt-0.5.4/apt-pkg/init.cc Tue Mar 13 01:51:46 2001
-+++ apt-0.5.4-patched/apt-pkg/init.cc Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/init.cc apt-0.5.4/apt-pkg/init.cc
+--- apt-0.5.4.orig/apt-pkg/init.cc 2001-03-13 15:51:46.000000000 +0900
++++ apt-0.5.4/apt-pkg/init.cc 2005-03-08 13:00:38.000000000 +0900
@@ -15,6 +15,8 @@
#include <apti18n.h>
#include <config.h>
@@ -394,9 +396,9 @@
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
-diff -ruN apt-0.5.4/apt-pkg/policy.cc apt-0.5.4-patched/apt-pkg/policy.cc
---- apt-0.5.4/apt-pkg/policy.cc Sun May 27 19:40:56 2001
-+++ apt-0.5.4-patched/apt-pkg/policy.cc Sun Nov 9 14:02:47 2003
+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
@@ -183,7 +183,7 @@
Pin *P = 0;
@@ -415,9 +417,9 @@
}
else
{
-diff -ruN apt-0.5.4/apt-pkg/tagfile.cc apt-0.5.4-patched/apt-pkg/tagfile.cc
---- apt-0.5.4/apt-pkg/tagfile.cc Mon May 14 01:56:26 2001
-+++ apt-0.5.4-patched/apt-pkg/tagfile.cc Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/tagfile.cc apt-0.5.4/apt-pkg/tagfile.cc
+--- apt-0.5.4.orig/apt-pkg/tagfile.cc 2001-05-14 14:56:26.000000000 +0900
++++ apt-0.5.4/apt-pkg/tagfile.cc 2005-03-08 13:00:38.000000000 +0900
@@ -197,7 +197,7 @@
return false;
@@ -443,9 +445,9 @@
return true;
}
-diff -ruN apt-0.5.4/apt-pkg/tagfile.h apt-0.5.4-patched/apt-pkg/tagfile.h
---- apt-0.5.4/apt-pkg/tagfile.h Sun Apr 22 01:42:52 2001
-+++ apt-0.5.4-patched/apt-pkg/tagfile.h Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/apt-pkg/tagfile.h apt-0.5.4/apt-pkg/tagfile.h
+--- apt-0.5.4.orig/apt-pkg/tagfile.h 2001-04-22 14:42:52.000000000 +0900
++++ apt-0.5.4/apt-pkg/tagfile.h 2005-03-08 13:00:38.000000000 +0900
@@ -34,7 +34,7 @@
// We have a limit of 256 tags per section.
@@ -455,9 +457,9 @@
unsigned int TagCount;
-diff -ruN apt-0.5.4/buildlib/environment.mak.in
apt-0.5.4-patched/buildlib/environment.mak.in
---- apt-0.5.4/buildlib/environment.mak.in Tue May 29 01:11:03 2001
-+++ apt-0.5.4-patched/buildlib/environment.mak.in Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/buildlib/environment.mak.in
apt-0.5.4/buildlib/environment.mak.in
+--- apt-0.5.4.orig/buildlib/environment.mak.in 2001-05-29 14:11:03.000000000
+0900
++++ apt-0.5.4/buildlib/environment.mak.in 2005-03-08 13:00:38.000000000
+0900
@@ -11,8 +11,8 @@
LIBSTDCPP_VER = @LIBSTDCPP_VER@
@@ -490,9 +492,9 @@
+SONAME_MAGIC=-install_name @PREFIX@/lib/
+LFLAGS_SO=-dynamiclib
-diff -ruN apt-0.5.4/buildlib/library.mak apt-0.5.4-patched/buildlib/library.mak
---- apt-0.5.4/buildlib/library.mak Mon Feb 26 23:16:05 2001
-+++ apt-0.5.4-patched/buildlib/library.mak Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/buildlib/library.mak apt-0.5.4/buildlib/library.mak
+--- apt-0.5.4.orig/buildlib/library.mak 2001-02-27 13:16:05.000000000
+0900
++++ apt-0.5.4/buildlib/library.mak 2005-03-08 13:00:38.000000000 +0900
@@ -15,17 +15,17 @@
# See defaults.mak for information about LOCAL
@@ -545,9 +547,9 @@
$(filter %.opic,$^) \
$($(@F)-SLIBS)
-diff -ruN apt-0.5.4/buildlib/ostable apt-0.5.4-patched/buildlib/ostable
---- apt-0.5.4/buildlib/ostable Tue Feb 20 02:03:17 2001
-+++ apt-0.5.4-patched/buildlib/ostable Sun Nov 9 14:02:47 2003
+diff -urN apt-0.5.4.orig/buildlib/ostable apt-0.5.4/buildlib/ostable
+--- apt-0.5.4.orig/buildlib/ostable 2001-02-20 16:03:17.000000000 +0900
++++ apt-0.5.4/buildlib/ostable 2005-03-08 13:00:38.000000000 +0900
@@ -14,6 +14,7 @@
hp-hpux[^-]* hp-ux
sun-solaris[^-]* solaris
@@ -556,9 +558,9 @@
# Catch all
.* unknown
-diff -ruN apt-0.5.4/cmdline/apt-cache.cc apt-0.5.4-patched/cmdline/apt-cache.cc
---- apt-0.5.4/cmdline/apt-cache.cc Sun Jul 1 20:10:32 2001
-+++ apt-0.5.4-patched/cmdline/apt-cache.cc Sun Nov 9 14:02:47 2003
+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
@@ -374,8 +374,10 @@
if (ReadPinFile(Plcy) == false)
return false;
@@ -581,9 +583,9 @@
// Iterate over all the package files and write them out.
char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10];
-diff -ruN apt-0.5.4/cmdline/apt-get.cc apt-0.5.4-patched/cmdline/apt-get.cc
---- apt-0.5.4/cmdline/apt-get.cc 2001-07-01 18:59:04.000000000 -0400
-+++ apt-0.5.4-patched/cmdline/apt-get.cc 2004-10-12 13:48:09.000000000
-0400
+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
@@ -113,6 +113,8 @@
return true;
}
@@ -710,9 +712,9 @@
// Deal with stdout not being a tty
if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
-diff -ruN apt-0.5.4/configure apt-0.5.4-patched/configure
---- apt-0.5.4/configure Sat Aug 18 20:46:43 2001
-+++ apt-0.5.4-patched/configure Sun Nov 9 14:02:48 2003
+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
@@ -2394,7 +2394,7 @@
ac_given_srcdir=$srcdir
@@ -740,18 +742,18 @@
exit 0
EOF
chmod +x $CONFIG_STATUS
-diff -ruN apt-0.5.4/configure.in apt-0.5.4-patched/configure.in
---- apt-0.5.4/configure.in Mon Jun 18 01:56:32 2001
-+++ apt-0.5.4-patched/configure.in Sun Nov 9 14:02:48 2003
+diff -urN apt-0.5.4.orig/configure.in apt-0.5.4/configure.in
+--- apt-0.5.4.orig/configure.in 2001-06-18 14:56:32.000000000 +0900
++++ apt-0.5.4/configure.in 2005-03-08 13:00:38.000000000 +0900
@@ -163,4 +163,4 @@
rc_LIBSTDCPP_VER
ah_GCC3DEP
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in
makefile:buildlib/makefile.in,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in
makefile.wrap:buildlib/makefile.in,make -f makefile.wrap -s dirs)
-diff -ruN apt-0.5.4/doc/apt-cache.8 apt-0.5.4-patched/doc/apt-cache.8
---- apt-0.5.4/doc/apt-cache.8 2001-08-18 20:48:24.000000000 -0400
-+++ apt-0.5.4-patched/doc/apt-cache.8 2004-10-07 01:08:45.000000000 -0400
+diff -urN apt-0.5.4.orig/doc/apt-cache.8 apt-0.5.4/doc/apt-cache.8
+--- apt-0.5.4.orig/doc/apt-cache.8 2001-08-19 09:48:24.000000000 +0900
++++ apt-0.5.4/doc/apt-cache.8 2005-03-08 13:00:38.000000000 +0900
@@ -277,16 +277,16 @@
option. The syntax is \fB-o Foo::Bar=bar\fR.
.SH "FILES"
@@ -772,9 +774,9 @@
storage area for state information in transit.
Configuration Item: Dir::State::Lists (implicit partial).
.SH "SEE ALSO"
-diff -ruN apt-0.5.4/doc/apt-cdrom.8 apt-0.5.4-patched/doc/apt-cdrom.8
---- apt-0.5.4/doc/apt-cdrom.8 2001-08-18 20:48:25.000000000 -0400
-+++ apt-0.5.4-patched/doc/apt-cdrom.8 2004-10-07 01:10:19.000000000 -0400
+diff -urN apt-0.5.4.orig/doc/apt-cdrom.8 apt-0.5.4/doc/apt-cdrom.8
+--- apt-0.5.4.orig/doc/apt-cdrom.8 2001-08-19 09:48:25.000000000 +0900
++++ apt-0.5.4/doc/apt-cdrom.8 2005-03-08 13:00:38.000000000 +0900
@@ -32,7 +32,7 @@
APT uses a CDROM ID to track which disc is currently in the drive and
@@ -784,9 +786,9 @@
.TP
\fBident\fR
A debugging tool to report the identity of the current disc as well
-diff -ruN apt-0.5.4/doc/apt-config.8 apt-0.5.4-patched/doc/apt-config.8
---- apt-0.5.4/doc/apt-config.8 2001-08-18 20:48:27.000000000 -0400
-+++ apt-0.5.4-patched/doc/apt-config.8 2004-10-07 01:09:29.000000000 -0400
+diff -urN apt-0.5.4.orig/doc/apt-config.8 apt-0.5.4/doc/apt-config.8
+--- apt-0.5.4.orig/doc/apt-config.8 2001-08-19 09:48:27.000000000 +0900
++++ apt-0.5.4/doc/apt-config.8 2005-03-08 13:00:38.000000000 +0900
@@ -13,7 +13,7 @@
.PP
\fBapt-config\fR is an internal program used by various portions of
@@ -796,9 +798,9 @@
easy to use by scripted applications.
.PP
Unless the \fB-h\fR, or \fB--help\fR option is given one of the
-diff -ruN apt-0.5.4/doc/apt-get.8 apt-0.5.4-patched/doc/apt-get.8
---- apt-0.5.4/doc/apt-get.8 2001-08-18 20:48:25.000000000 -0400
-+++ apt-0.5.4-patched/doc/apt-get.8 2004-10-07 01:16:25.000000000 -0400
+diff -urN apt-0.5.4.orig/doc/apt-get.8 apt-0.5.4/doc/apt-get.8
+--- apt-0.5.4.orig/doc/apt-get.8 2001-08-19 09:48:25.000000000 +0900
++++ apt-0.5.4/doc/apt-get.8 2005-03-08 13:00:38.000000000 +0900
@@ -20,7 +20,7 @@
\fBupdate\fR
update is used to resynchronize the package index files from
@@ -927,9 +929,9 @@
storage area for state information in transit.
Configuration Item: Dir::State::Lists (implicit partial).
.SH "SEE ALSO"
-diff -ruN apt-0.5.4/doc/apt_preferences.5
apt-0.5.4-patched/doc/apt_preferences.5
---- apt-0.5.4/doc/apt_preferences.5 2001-08-18 20:48:28.000000000 -0400
-+++ apt-0.5.4-patched/doc/apt_preferences.5 2004-10-07 01:12:21.000000000
-0400
+diff -urN apt-0.5.4.orig/doc/apt_preferences.5 apt-0.5.4/doc/apt_preferences.5
+--- apt-0.5.4.orig/doc/apt_preferences.5 2001-08-19 09:48:28.000000000
+0900
++++ apt-0.5.4/doc/apt_preferences.5 2005-03-08 13:00:38.000000000 +0900
@@ -12,7 +12,7 @@
It is meant to be user editable and manipulatable from software. The file
consists of a number of records formed like the dpkg status file, space
@@ -939,9 +941,9 @@
.SH "VERSIONING"
.PP
One purpose of the preferences file is to let the user select which version
-diff -ruN apt-0.5.4/doc/sources.list.5 apt-0.5.4-patched/doc/sources.list.5
---- apt-0.5.4/doc/sources.list.5 2001-08-18 20:48:26.000000000 -0400
-+++ apt-0.5.4-patched/doc/sources.list.5 2004-10-07 01:06:21.000000000
-0400
+diff -urN apt-0.5.4.orig/doc/sources.list.5 apt-0.5.4/doc/sources.list.5
+--- apt-0.5.4.orig/doc/sources.list.5 2001-08-19 09:48:26.000000000 +0900
++++ apt-0.5.4/doc/sources.list.5 2005-03-08 13:00:38.000000000 +0900
@@ -11,7 +11,7 @@
The package resource list is used to locate archives of the package
distribution system in use on the system. At this time, this manual page
@@ -963,9 +965,9 @@
deb-src type describes a debian distribution's source code in
the same form as the deb type. A deb-src line is
required to fetch source indexes.
-diff -ruN apt-0.5.4/dselect/install apt-0.5.4-patched/dselect/install
---- apt-0.5.4/dselect/install Tue Feb 20 02:03:17 2001
-+++ apt-0.5.4-patched/dselect/install Sun Nov 9 14:02:48 2003
+diff -urN apt-0.5.4.orig/dselect/install apt-0.5.4/dselect/install
+--- apt-0.5.4.orig/dselect/install 2001-02-20 16:03:17.000000000 +0900
++++ apt-0.5.4/dselect/install 2005-03-08 13:00:38.000000000 +0900
@@ -3,8 +3,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -977,9 +979,9 @@
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
-diff -ruN apt-0.5.4/dselect/setup apt-0.5.4-patched/dselect/setup
---- apt-0.5.4/dselect/setup Wed Jan 26 23:15:10 2000
-+++ apt-0.5.4-patched/dselect/setup Sun Nov 9 14:36:03 2003
+diff -urN apt-0.5.4.orig/dselect/setup apt-0.5.4/dselect/setup
+--- apt-0.5.4.orig/dselect/setup 2000-01-27 13:15:10.000000000 +0900
++++ apt-0.5.4/dselect/setup 2005-03-08 13:00:38.000000000 +0900
@@ -23,15 +23,17 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
@@ -1051,9 +1053,9 @@
my $answer = <STDIN>;
chomp ($answer);
$answer =~ s/\s+/ /og;
-diff -ruN apt-0.5.4/dselect/update apt-0.5.4-patched/dselect/update
---- apt-0.5.4/dselect/update Mon Mar 12 20:45:36 2001
-+++ apt-0.5.4-patched/dselect/update Sun Nov 9 14:02:48 2003
+diff -urN apt-0.5.4.orig/dselect/update apt-0.5.4/dselect/update
+--- apt-0.5.4.orig/dselect/update 2001-03-13 10:45:36.000000000 +0900
++++ apt-0.5.4/dselect/update 2005-03-08 13:00:38.000000000 +0900
@@ -4,13 +4,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1072,33 +1074,41 @@
PROMPT="false"
RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
-diff -ruN apt-0.5.4/methods/connect.cc apt-0.5.4-patched/methods/connect.cc
---- apt-0.5.4/methods/connect.cc Tue Feb 20 02:03:18 2001
-+++ apt-0.5.4-patched/methods/connect.cc Sun Nov 9 14:02:48 2003
-@@ -90,7 +90,7 @@
+diff -urN apt-0.5.4.orig/methods/connect.cc apt-0.5.4/methods/connect.cc
+--- apt-0.5.4.orig/methods/connect.cc 2001-02-20 16:03:18.000000000 +0900
++++ apt-0.5.4/methods/connect.cc 2005-03-08 13:10:40.000000000 +0900
+@@ -90,7 +90,11 @@
// Check the socket for an error condition
unsigned int Err;
- unsigned int Len = sizeof(Err);
++#ifndef HAVE_SOCKLEN_T
+ int Len = sizeof(Err);
++#else
++ socklen_t Len = sizeof(Err);
++#endif
if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
-diff -ruN apt-0.5.4/methods/ftp.cc apt-0.5.4-patched/methods/ftp.cc
---- apt-0.5.4/methods/ftp.cc Tue May 22 00:02:00 2001
-+++ apt-0.5.4-patched/methods/ftp.cc Sun Nov 9 14:02:48 2003
-@@ -694,7 +694,7 @@
+diff -urN apt-0.5.4.orig/methods/ftp.cc apt-0.5.4/methods/ftp.cc
+--- apt-0.5.4.orig/methods/ftp.cc 2001-05-22 13:02:00.000000000 +0900
++++ apt-0.5.4/methods/ftp.cc 2005-03-08 13:09:26.000000000 +0900
+@@ -694,7 +694,11 @@
if (WaitFd(DataFd,true,TimeOut) == false)
return _error->Error("Could not connect data socket, connection timed
out");
unsigned int Err;
- unsigned int Len = sizeof(Err);
++#ifndef HAVE_SOCKLEN_T
+ int Len = sizeof(Err);
++#else
++ socklen_t Len = sizeof(Err);
++#endif
if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
if (Err != 0)
-diff -ruN apt-0.5.4/methods/rfc2553emu.h apt-0.5.4-patched/methods/rfc2553emu.h
---- apt-0.5.4/methods/rfc2553emu.h Sun Jun 18 02:04:45 2000
-+++ apt-0.5.4-patched/methods/rfc2553emu.h Sun Nov 9 14:02:48 2003
+diff -urN apt-0.5.4.orig/methods/rfc2553emu.h apt-0.5.4/methods/rfc2553emu.h
+--- apt-0.5.4.orig/methods/rfc2553emu.h 2000-06-18 15:04:45.000000000
+0900
++++ apt-0.5.4/methods/rfc2553emu.h 2005-03-08 13:00:38.000000000 +0900
@@ -26,6 +26,11 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -1120,19 +1130,19 @@
// getaddrinfo support?
#ifndef HAVE_GETADDRINFO
// Renamed to advoid type clashing.. (for debugging)
-@@ -100,6 +107,9 @@
- // #define NI_NOFQDN (1<<2)
+@@ -101,6 +108,9 @@
#define NI_NAMEREQD (1<<3)
#define NI_DATAGRAM (1<<4)
-+ #endif
+ #endif
+ #ifndef NI_DATAGRAM
+ #define NI_DATAGRAM NI_DGRAM
- #endif
++ #endif
#define sockaddr_storage sockaddr_in
-diff -ruN apt-0.5.4/patch_flush apt-0.5.4-patched/patch_flush
---- apt-0.5.4/patch_flush Wed Dec 31 19:00:00 1969
-+++ apt-0.5.4-patched/patch_flush Sun Nov 9 14:02:48 2003
+ #endif
+diff -urN apt-0.5.4.orig/patch_flush apt-0.5.4/patch_flush
+--- apt-0.5.4.orig/patch_flush 1970-01-01 09:00:00.000000000 +0900
++++ apt-0.5.4/patch_flush 2005-03-08 13:00:38.000000000 +0900
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/apt.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- apt.info 10 Dec 2004 15:11:00 -0000 1.11
+++ apt.info 22 Jun 2005 18:34:20 -0000 1.12
@@ -11,12 +11,10 @@
sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' <%a/%n.patch | 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.bak -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i ; done
-#perl -pi.bak -e 's/socklen_t/int/' methods/ftp.h methods/ftp.cc
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings
+SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings
-DHAVE_SOCKLEN_T=1
CompileScript: <<
export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
make -f makefile.wrap NOISY=1
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
