Update of
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12609/10.4-transitional/main/finkinfo/base
Modified Files:
apt-shlibs.info apt-shlibs.patch apt.info apt.patch
Log Message:
this builds too, rearranged apt a little
Index: apt-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/base/apt-shlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt-shlibs.patch 13 Mar 2006 21:05:14 -0000 1.1
+++ apt-shlibs.patch 14 Mar 2006 12:49:17 -0000 1.2
@@ -1,19 +1,6 @@
---- apt-0.5.4/Makefile Tue Feb 20 02:03:16 2001
-+++ apt-0.5.4-new/Makefile Wed Aug 17 17:41:17 2005
-@@ -13,11 +13,6 @@
- all headers library clean veryclean binary program doc dirs:
- $(MAKE) -C apt-pkg $@
- $(MAKE) -C apt-inst $@
-- $(MAKE) -C methods $@
-- $(MAKE) -C cmdline $@
-- $(MAKE) -C ftparchive $@
-- $(MAKE) -C dselect $@
-- $(MAKE) -C doc $@
-
- # Some very common aliases
- .PHONY: maintainer-clean dist-clean distclean pristine sanity
---- apt-0.5.4/apt-inst/makefile Mon Feb 26 23:16:05 2001
-+++ apt-0.5.4-new/apt-inst/makefile Wed Aug 17 17:41:12 2005
+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
@@ -22,8 +9,115 @@
LIBRARY=apt-inst
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
MAJOR=1.0
---- apt-0.5.4/apt-pkg/deb/debindexfile.cc Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-new/apt-pkg/deb/debindexfile.cc Wed Aug 17 17:41:12 2005
+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 @@
+ // ---------------------------------------------------------------------
+ /* */
+ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
+- Base(0)
++ Base(0), iFd(0)
+ {
+ if ((Flags & NoImmMap) != NoImmMap)
+ Map(F);
+@@ -51,7 +51,7 @@
+ // ---------------------------------------------------------------------
+ /* */
+ MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
+- Base(0)
++ Base(0), iFd(0)
+ {
+ }
+ /*}}}*/
+@@ -68,6 +68,7 @@
+ /* */
+ bool MMap::Map(FileFd &Fd)
+ {
++ iFd = &Fd;
+ iSize = Fd.Size();
+
+ // Set the permissions.
+@@ -81,10 +82,19 @@
+ if (iSize == 0)
+ return _error->Error(_("Can't mmap an empty file"));
+
++#ifndef EMULATE_MMAP
+ // Map it.
+ Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
+ if (Base == (void *)-1)
+ return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);
++#else
++ Base = new unsigned char[iSize];
++ if (Base == NULL)
++ return _error->Errno("mmap",_("Couldn't allocate %lu bytes to emulate
mmap"),iSize);
++
++ Fd.Seek(0);
++ Fd.Read(Base, iSize, true);
++#endif
+
+ return true;
+ }
+@@ -100,8 +110,16 @@
+ if (DoSync == true)
+ Sync();
+
++#ifndef EMULATE_MMAP
+ if (munmap((char *)Base,iSize) != 0)
+ _error->Warning("Unable to munmap");
++#else
++ if ((Flags & ReadOnly) != ReadOnly && iFd != 0) {
++ iFd->Seek(0);
++ iFd->Write(Base, iSize);
++ }
++ delete [] (unsigned char *)Base;
++#endif
+
+ iSize = 0;
+ Base = 0;
+@@ -117,11 +135,13 @@
+ if ((Flags & UnMapped) == UnMapped)
+ return true;
+
++#ifndef EMULATE_MMAP
+ #ifdef _POSIX_SYNCHRONIZED_IO
+ if ((Flags & ReadOnly) != ReadOnly)
+ if (msync((char *)Base,iSize,MS_SYNC) != 0)
+ return _error->Errno("msync","Unable to write mmap");
+ #endif
++#endif
+ return true;
+ }
+ /*}}}*/
+@@ -133,12 +153,14 @@
+ if ((Flags & UnMapped) == UnMapped)
+ return true;
+
++#ifndef EMULATE_MMAP
+ #ifdef _POSIX_SYNCHRONIZED_IO
+ unsigned long PSize = sysconf(_SC_PAGESIZE);
+ 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
+ return true;
+ }
+ /*}}}*/
+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;
+ void *Base;
++ FileFd *iFd;
+
+ bool Map(FileFd &Fd);
+ bool Close(bool DoSync = true);
+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 @@
}
@@ -36,8 +130,9 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
---- apt-0.5.4/apt-pkg/deb/debsystem.cc Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-new/apt-pkg/deb/debsystem.cc Wed Aug 17 17:41:12 2005
+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>
@@ -225,19 +320,20 @@
return true;
}
/*}}}*/
-@@ -216,6 +359,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;
}
---- apt-0.5.4/apt-pkg/deb/debsystem.h Sun Apr 29 01:13:51 2001
-+++ apt-0.5.4-new/apt-pkg/deb/debsystem.h Wed Aug 17 17:41:12 2005
+ 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();
@@ -246,8 +342,9 @@
public:
---- apt-0.5.4/apt-pkg/deb/debversion.cc Mon May 7 01:14:53 2001
-+++ apt-0.5.4-new/apt-pkg/deb/debversion.cc Wed Aug 17 17:41:12 2005
+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;
@@ -260,8 +357,9 @@
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
---- apt-0.5.4/apt-pkg/init.cc Tue Mar 13 01:51:46 2001
-+++ apt-0.5.4-new/apt-pkg/init.cc Wed Aug 17 17:41:12 2005
+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>
@@ -298,8 +396,9 @@
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
---- apt-0.5.4/apt-pkg/policy.cc Sun May 27 19:40:56 2001
-+++ apt-0.5.4-new/apt-pkg/policy.cc Wed Aug 17 17:41:12 2005
+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;
@@ -318,8 +417,9 @@
}
else
{
---- apt-0.5.4/apt-pkg/tagfile.cc Mon May 14 01:56:26 2001
-+++ apt-0.5.4-new/apt-pkg/tagfile.cc Wed Aug 17 17:41:12 2005
+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;
@@ -345,8 +445,9 @@
return true;
}
---- apt-0.5.4/apt-pkg/tagfile.h Sun Apr 22 01:42:52 2001
-+++ apt-0.5.4-new/apt-pkg/tagfile.h Wed Aug 17 17:41:12 2005
+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.
@@ -356,8 +457,9 @@
unsigned int TagCount;
---- apt-0.5.4/buildlib/environment.mak.in Tue May 29 01:11:03 2001
-+++ apt-0.5.4-new/buildlib/environment.mak.in Wed Aug 17 17:41:12 2005
+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@
@@ -390,8 +492,9 @@
+SONAME_MAGIC=-install_name @PREFIX@/lib/
+LFLAGS_SO=-dynamiclib
---- apt-0.5.4/buildlib/library.mak Mon Feb 26 23:16:05 2001
-+++ apt-0.5.4-new/buildlib/library.mak Wed Aug 17 17:41:12 2005
+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
@@ -444,8 +547,9 @@
$(filter %.opic,$^) \
$($(@F)-SLIBS)
---- apt-0.5.4/buildlib/ostable Tue Feb 20 02:03:17 2001
-+++ apt-0.5.4-new/buildlib/ostable Wed Aug 17 17:41:12 2005
+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
@@ -454,8 +558,9 @@
# Catch all
.* unknown
---- apt-0.5.4/cmdline/apt-cache.cc Sun Jul 1 20:10:32 2001
-+++ apt-0.5.4-new/cmdline/apt-cache.cc Wed Aug 17 17:41:12 2005
+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;
@@ -478,8 +583,9 @@
// Iterate over all the package files and write them out.
char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10];
---- apt-0.5.4/cmdline/apt-get.cc Sun Jul 1 18:59:04 2001
-+++ apt-0.5.4-new/cmdline/apt-get.cc Wed Aug 17 17:41:12 2005
+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;
}
@@ -606,8 +712,9 @@
// Deal with stdout not being a tty
if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
---- apt-0.5.4/configure Sat Aug 18 20:46:43 2001
-+++ apt-0.5.4-new/configure Wed Aug 17 17:41:12 2005
+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
@@ -635,16 +742,18 @@
exit 0
EOF
chmod +x $CONFIG_STATUS
---- apt-0.5.4/configure.in Mon Jun 18 01:56:32 2001
-+++ apt-0.5.4-new/configure.in Wed Aug 17 17:41:12 2005
+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)
---- apt-0.5.4/doc/apt-cache.8 Sat Aug 18 20:48:24 2001
-+++ apt-0.5.4-new/doc/apt-cache.8 Wed Aug 17 17:41:12 2005
+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"
@@ -665,8 +774,9 @@
storage area for state information in transit.
Configuration Item: Dir::State::Lists (implicit partial).
.SH "SEE ALSO"
---- apt-0.5.4/doc/apt-cdrom.8 Sat Aug 18 20:48:25 2001
-+++ apt-0.5.4-new/doc/apt-cdrom.8 Wed Aug 17 17:41:12 2005
+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
@@ -676,8 +786,9 @@
.TP
\fBident\fR
A debugging tool to report the identity of the current disc as well
---- apt-0.5.4/doc/apt-config.8 Sat Aug 18 20:48:27 2001
-+++ apt-0.5.4-new/doc/apt-config.8 Wed Aug 17 17:41:12 2005
+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
@@ -687,8 +798,9 @@
easy to use by scripted applications.
.PP
Unless the \fB-h\fR, or \fB--help\fR option is given one of the
---- apt-0.5.4/doc/apt-get.8 Sat Aug 18 20:48:25 2001
-+++ apt-0.5.4-new/doc/apt-get.8 Wed Aug 17 17:41:12 2005
+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
@@ -817,8 +929,9 @@
storage area for state information in transit.
Configuration Item: Dir::State::Lists (implicit partial).
.SH "SEE ALSO"
---- apt-0.5.4/doc/apt_preferences.5 Sat Aug 18 20:48:28 2001
-+++ apt-0.5.4-new/doc/apt_preferences.5 Wed Aug 17 17:41:12 2005
+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
@@ -828,8 +941,9 @@
.SH "VERSIONING"
.PP
One purpose of the preferences file is to let the user select which version
---- apt-0.5.4/doc/sources.list.5 Sat Aug 18 20:48:26 2001
-+++ apt-0.5.4-new/doc/sources.list.5 Wed Aug 17 17:41:12 2005
+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
@@ -851,8 +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.
---- apt-0.5.4/dselect/install Tue Feb 20 02:03:17 2001
-+++ apt-0.5.4-new/dselect/install Wed Aug 17 17:41:12 2005
+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"
@@ -864,8 +979,9 @@
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
---- apt-0.5.4/dselect/setup Wed Jan 26 23:15:10 2000
-+++ apt-0.5.4-new/dselect/setup Wed Aug 17 17:41:12 2005
+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];
@@ -937,8 +1053,9 @@
my $answer = <STDIN>;
chomp ($answer);
$answer =~ s/\s+/ /og;
---- apt-0.5.4/dselect/update Mon Mar 12 20:45:36 2001
-+++ apt-0.5.4-new/dselect/update Wed Aug 17 17:41:12 2005
+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"
@@ -957,8 +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 \
---- apt-0.5.4/methods/rfc2553emu.h Sun Jun 18 02:04:45 2000
-+++ apt-0.5.4-new/methods/rfc2553emu.h Wed Aug 17 17:41:12 2005
+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 -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 -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>
@@ -980,18 +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
---- apt-0.5.4/patch_flush Wed Dec 31 19:00:00 1969
-+++ apt-0.5.4-new/patch_flush Wed Aug 17 17:41:12 2005
+ #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
@@ -1004,3 +1155,36 @@
+done
+
+exit 0
+diff -urN apt-0.5.4/apt-inst/contrib/extracttar.cc
apt-new/apt-inst/contrib/extracttar.cc
+--- apt-0.5.4/apt-inst/contrib/extracttar.cc 2001-05-27 19:47:09.000000000
-0400
++++ apt-new/apt-inst/contrib/extracttar.cc 2005-11-25 06:27:24.000000000
-0500
+@@ -144,6 +144,18 @@
+ return true;
+ }
+ /*}}}*/
++
++// Handle the ridiculous way that tar stores large numbers
++static bool TarUIDToNum(const char *Str, unsigned long &Res, unsigned Len) {
++ switch (*Str) {
++ case '\200':
++ Res = ntohl(*((unsigned long *)(Str + Len -
sizeof(unsigned long))));
++ return true;
++ default:
++ return StrToNum(Str+1, Res, Len-1, 8);
++ }
++}
++
+ // ExtractTar::Go - Perform extraction
/*{{{*/
+ // ---------------------------------------------------------------------
+ /* This reads each 512 byte block from the archive and extracts the header
+@@ -193,8 +205,8 @@
+ unsigned long UID;
+ unsigned long GID;
+ if (StrToNum(Tar->Mode,Itm.Mode,sizeof(Tar->Mode),8) == false ||
+- StrToNum(Tar->UserID,UID,sizeof(Tar->UserID),8) == false ||
+- StrToNum(Tar->GroupID,GID,sizeof(Tar->GroupID),8) == false ||
++ TarUIDToNum(Tar->UserID,Itm.UID,sizeof(Tar->UserID)) == false ||
++ TarUIDToNum(Tar->GroupID,Itm.GID,sizeof(Tar->GroupID)) == false ||
+ 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 ||
Index: apt.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/base/apt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.patch 13 Mar 2006 21:05:14 -0000 1.1
+++ apt.patch 14 Mar 2006 12:49:17 -0000 1.2
@@ -1,25 +1,37 @@
-diff -uNr apt-0.6.43.3/apt-inst/contrib/extracttar.cc
apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc
--- apt-0.6.43.3/apt-inst/contrib/extracttar.cc 2005-10-19
15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc 2006-03-11
12:27:33.000000000 -0500
-@@ -149,6 +149,17 @@
++++ apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc 2006-03-14
06:50:14.000000000 -0500
+@@ -149,7 +149,30 @@
close(Pipes[1]);
return true;
}
+
++
++
++
++
++
++
++
++
++
++
+ /*}}}*/
++
+// Handle the ridiculous way that tar stores large numbers
+static bool TarUIDToNum(const char *Str, unsigned long &Res, unsigned Len) {
+ switch (*Str) {
+ case '\200':
-+ Res = *((unsigned long *)(Str + Len - sizeof(unsigned
long)));
++ Res = ntohl(*((unsigned long *)(Str + Len -
sizeof(unsigned long))));
+ return true;
+ default:
+ return StrToNum(Str+1, Res, Len-1, 8);
+ }
+}
- /*}}}*/
++
// ExtractTar::Go - Perform extraction
/*{{{*/
// ---------------------------------------------------------------------
-@@ -197,8 +208,8 @@
+ /* This reads each 512 byte block from the archive and extracts the header
+@@ -197,8 +220,8 @@
// Decode all of the fields
pkgDirStream::Item Itm;
if (StrToNum(Tar->Mode,Itm.Mode,sizeof(Tar->Mode),8) == false ||
@@ -30,24 +42,22 @@
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 ||
-diff -uNr apt-0.6.43.3/apt-inst/makefile apt-0.6.43.3-new/apt-inst/makefile
--- apt-0.6.43.3/apt-inst/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/apt-inst/makefile 2006-03-11 12:27:33.000000000 -0500
-@@ -12,9 +12,9 @@
++++ apt-0.6.43.3-new/apt-inst/makefile 2006-03-14 06:53:00.000000000 -0500
+@@ -12,9 +12,10 @@
# The library name
LIBRARY=apt-inst
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
--MAJOR=1.1
-+MAJOR=0.6.40
++COMPAT=1.0
+ MAJOR=1.1
MINOR=0
-SLIBS=$(PTHREADLIB) -lapt-pkg
+SLIBS=$(PTHREADLIB) -lapt-pkg $(INTLLIBS)
APT_DOMAIN:=libapt-inst$(MAJOR)
# Source code for the contributed non-core things
-diff -uNr apt-0.6.43.3/apt-pkg/acquire-item.cc
apt-0.6.43.3-new/apt-pkg/acquire-item.cc
--- apt-0.6.43.3/apt-pkg/acquire-item.cc 2006-02-22 04:04:32.000000000
-0500
-+++ apt-0.6.43.3-new/apt-pkg/acquire-item.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/acquire-item.cc 2006-03-14 06:50:14.000000000
-0500
@@ -739,12 +739,14 @@
// ---------------------------------------------------------------------
/* This just sets up the initial fetch environment and queues the first
@@ -64,9 +74,8 @@
{
Retries = _config->FindI("Acquire::Retries",0);
-diff -uNr apt-0.6.43.3/apt-pkg/contrib/cdromutl.cc
apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc
--- apt-0.6.43.3/apt-pkg/contrib/cdromutl.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc 2006-03-14
06:50:14.000000000 -0500
@@ -23,13 +23,13 @@
#include <sys/wait.h>
@@ -94,9 +103,8 @@
return _error->Errno("statfs",_("Failed to stat the cdrom"));
// We use a kilobyte block size to advoid overflow
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debindexfile.cc
apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc
--- apt-0.6.43.3/apt-pkg/deb/debindexfile.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc 2006-03-14
06:50:14.000000000 -0500
@@ -444,3 +444,9 @@
}
@@ -107,9 +115,8 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debsystem.cc
apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc
--- apt-0.6.43.3/apt-pkg/deb/debsystem.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc 2006-03-14 06:50:14.000000000
-0500
@@ -27,6 +27,111 @@
#include <dirent.h>
#include <errno.h>
@@ -310,9 +317,8 @@
}
return false;
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debsystem.h
apt-0.6.43.3-new/apt-pkg/deb/debsystem.h
--- apt-0.6.43.3/apt-pkg/deb/debsystem.h 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.h 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.h 2006-03-14 06:50:14.000000000
-0500
@@ -25,6 +25,7 @@
bool CheckUpdates();
@@ -321,9 +327,8 @@
public:
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debversion.cc
apt-0.6.43.3-new/apt-pkg/deb/debversion.cc
--- apt-0.6.43.3/apt-pkg/deb/debversion.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debversion.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debversion.cc 2006-03-14 06:50:14.000000000
-0500
@@ -24,6 +24,11 @@
debVersioningSystem debVS;
@@ -336,9 +341,8 @@
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-diff -uNr apt-0.6.43.3/apt-pkg/deb/dpkgpm.cc
apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc
--- apt-0.6.43.3/apt-pkg/deb/dpkgpm.cc 2005-10-19 15:19:08.000000000 -0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc 2006-03-14 06:50:14.000000000
-0500
@@ -26,6 +26,10 @@
#include <errno.h>
#include <stdio.h>
@@ -350,9 +354,8 @@
#include <map>
#include <config.h>
-diff -uNr apt-0.6.43.3/apt-pkg/init.cc apt-0.6.43.3-new/apt-pkg/init.cc
--- apt-0.6.43.3/apt-pkg/init.cc 2005-11-28 04:55:46.000000000 -0500
-+++ apt-0.6.43.3-new/apt-pkg/init.cc 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/init.cc 2006-03-14 06:50:14.000000000 -0500
@@ -15,6 +15,8 @@
#include <apti18n.h>
#include <config.h>
@@ -389,21 +392,18 @@
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
-diff -uNr apt-0.6.43.3/apt-pkg/makefile apt-0.6.43.3-new/apt-pkg/makefile
--- apt-0.6.43.3/apt-pkg/makefile 2005-11-28 04:55:46.000000000 -0500
-+++ apt-0.6.43.3-new/apt-pkg/makefile 2006-03-11 12:28:11.000000000 -0500
-@@ -13,7 +13,7 @@
++++ apt-0.6.43.3-new/apt-pkg/makefile 2006-03-14 06:53:10.000000000 -0500
+@@ -13,6 +13,7 @@
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
--MAJOR=3.11
-+MAJOR=0.6.40
++COMPAT=3
+ MAJOR=3.11
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
- APT_DOMAIN:=libapt-pkg$(MAJOR)
-diff -uNr apt-0.6.43.3/buildlib/environment.mak.in
apt-0.6.43.3-new/buildlib/environment.mak.in
--- apt-0.6.43.3/buildlib/environment.mak.in 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/buildlib/environment.mak.in 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/buildlib/environment.mak.in 2006-03-14
06:50:14.000000000 -0500
@@ -7,14 +7,14 @@
CC = @CC@
CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
@@ -443,9 +443,8 @@
+#endif
+SONAME_MAGIC=-install_name @PREFIX@/lib/
+LFLAGS_SO=-dynamiclib
-diff -uNr apt-0.6.43.3/buildlib/library.mak
apt-0.6.43.3-new/buildlib/library.mak
--- apt-0.6.43.3/buildlib/library.mak 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/buildlib/library.mak 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/buildlib/library.mak 2006-03-14 06:54:25.000000000
-0500
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
@@ -456,7 +455,7 @@
$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename
$(SOURCE)))))
$(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
-$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
-+$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).$(MAJOR).dylib
++$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).$(COMPAT).dylib
$(LOCAL)-SLIBS := $(SLIBS)
$(LOCAL)-LIBRARY := $(LIBRARY)
@@ -495,14 +494,13 @@
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
- -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \
+ -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) \
-+ -compatibility_version $(MAJOR) \
-+ -current_version $(MAJOR) \
++ -compatibility_version $(COMPAT) \
++ -current_version $(MAJOR).$(MINOR) \
$(filter %.opic,$^) \
$($(@F)-SLIBS)
-diff -uNr apt-0.6.43.3/buildlib/ostable apt-0.6.43.3-new/buildlib/ostable
--- apt-0.6.43.3/buildlib/ostable 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/buildlib/ostable 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/buildlib/ostable 2006-03-14 06:50:14.000000000 -0500
@@ -16,6 +16,7 @@
hp-hpux[^-]* hp-ux
sun-solaris[^-]* solaris
@@ -511,9 +509,8 @@
# Catch all
.* unknown
-diff -uNr apt-0.6.43.3/buildlib/sgml_manpage.mak
apt-0.6.43.3-new/buildlib/sgml_manpage.mak
--- apt-0.6.43.3/buildlib/sgml_manpage.mak 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/buildlib/sgml_manpage.mak 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/buildlib/sgml_manpage.mak 2006-03-14 06:50:14.000000000
-0500
@@ -11,7 +11,7 @@
# See defaults.mak for information about LOCAL
@@ -523,9 +520,8 @@
LOCAL := sgml-manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)
-diff -uNr apt-0.6.43.3/cmdline/apt-get.cc apt-0.6.43.3-new/cmdline/apt-get.cc
--- apt-0.6.43.3/cmdline/apt-get.cc 2006-02-22 04:04:32.000000000 -0500
-+++ apt-0.6.43.3-new/cmdline/apt-get.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/cmdline/apt-get.cc 2006-03-14 06:50:14.000000000
-0500
@@ -53,7 +53,7 @@
#include <termios.h>
#include <sys/ioctl.h>
@@ -711,9 +707,8 @@
// Deal with stdout not being a tty
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
-diff -uNr apt-0.6.43.3/cmdline/makefile apt-0.6.43.3-new/cmdline/makefile
--- apt-0.6.43.3/cmdline/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/cmdline/makefile 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/cmdline/makefile 2006-03-14 06:50:14.000000000 -0500
@@ -7,42 +7,42 @@
# The apt-cache program
@@ -763,9 +758,8 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-extracttemplates.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.43.3/configure apt-0.6.43.3-new/configure
--- apt-0.6.43.3/configure 2006-02-22 04:22:55.000000000 -0500
-+++ apt-0.6.43.3-new/configure 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/configure 2006-03-14 06:50:14.000000000 -0500
@@ -1296,8 +1296,8 @@
ac_ext=c
@@ -867,18 +861,16 @@
esac
done
_ACEOF
-diff -uNr apt-0.6.43.3/configure.in apt-0.6.43.3-new/configure.in
--- apt-0.6.43.3/configure.in 2006-02-22 04:04:32.000000000 -0500
-+++ apt-0.6.43.3-new/configure.in 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/configure.in 2006-03-14 06:50:14.000000000 -0500
@@ -200,4 +200,4 @@
AC_SUBST(USE_NLS)
AC_PATH_PROG(BASH, bash)
-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 -uNr apt-0.6.43.3/doc/apt-cache.8 apt-0.6.43.3-new/doc/apt-cache.8
--- apt-0.6.43.3/doc/apt-cache.8 2006-02-22 04:23:13.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-cache.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-cache.8 2006-03-14 06:50:14.000000000 -0500
@@ -42,7 +42,7 @@
.TP
@@ -925,9 +917,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-cdrom.8 apt-0.6.43.3-new/doc/apt-cdrom.8
--- apt-0.6.43.3/doc/apt-cdrom.8 2006-02-22 04:23:17.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-cdrom.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-cdrom.8 2006-03-14 06:50:14.000000000 -0500
@@ -43,7 +43,7 @@
add
add is used to add a new disc to the source list\&. It will unmount the CDROM
device, prompt for a disk to be inserted and then procceed to scan it and copy
the index files\&. If the disc does not have a proper \fIdisk\fR directory you
will be prompted for a descriptive title\&.
@@ -946,9 +937,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-config.8 apt-0.6.43.3-new/doc/apt-config.8
--- apt-0.6.43.3/doc/apt-config.8 2006-02-22 04:23:27.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-config.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-config.8 2006-03-14 06:50:14.000000000 -0500
@@ -31,7 +31,7 @@
.SH "DESCRIPTION"
@@ -967,9 +957,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-get.8 apt-0.6.43.3-new/doc/apt-get.8
--- apt-0.6.43.3/doc/apt-get.8 2006-02-22 04:23:15.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-get.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-get.8 2006-03-14 06:50:14.000000000 -0500
@@ -38,11 +38,11 @@
.TP
@@ -1076,9 +1065,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt_preferences.5
apt-0.6.43.3-new/doc/apt_preferences.5
--- apt-0.6.43.3/doc/apt_preferences.5 2006-02-22 04:23:31.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt_preferences.5 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/doc/apt_preferences.5 2006-03-14 06:50:14.000000000
-0500
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1115,9 +1103,8 @@
.SH AUTHOR
APT team.
-diff -uNr apt-0.6.43.3/doc/sources.list.5 apt-0.6.43.3-new/doc/sources.list.5
--- apt-0.6.43.3/doc/sources.list.5 2006-02-22 04:23:24.000000000 -0500
-+++ apt-0.6.43.3-new/doc/sources.list.5 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/doc/sources.list.5 2006-03-14 06:50:14.000000000
-0500
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1136,9 +1123,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/dselect/install apt-0.6.43.3-new/dselect/install
--- apt-0.6.43.3/dselect/install 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/install 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/install 2006-03-14 06:50:14.000000000 -0500
@@ -6,8 +6,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1150,9 +1136,8 @@
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
-diff -uNr apt-0.6.43.3/dselect/setup apt-0.6.43.3-new/dselect/setup
--- apt-0.6.43.3/dselect/setup 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/setup 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/setup 2006-03-14 06:50:14.000000000 -0500
@@ -23,15 +23,17 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
@@ -1225,9 +1210,8 @@
my $answer = <STDIN>;
chomp ($answer);
$answer =~ s/\s+/ /og;
-diff -uNr apt-0.6.43.3/dselect/update apt-0.6.43.3-new/dselect/update
--- apt-0.6.43.3/dselect/update 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/update 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/update 2006-03-14 06:50:14.000000000 -0500
@@ -7,13 +7,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1246,9 +1230,8 @@
PROMPT="false"
RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
-diff -uNr apt-0.6.43.3/ftparchive/contents.cc
apt-0.6.43.3-new/ftparchive/contents.cc
--- apt-0.6.43.3/ftparchive/contents.cc 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/ftparchive/contents.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/ftparchive/contents.cc 2006-03-14 06:50:14.000000000
-0500
@@ -41,7 +41,6 @@
#include <stdio.h>
#include <stdlib.h>
@@ -1257,9 +1240,8 @@
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
-diff -uNr apt-0.6.43.3/ftparchive/makefile apt-0.6.43.3-new/ftparchive/makefile
--- apt-0.6.43.3/ftparchive/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/ftparchive/makefile 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/ftparchive/makefile 2006-03-14 06:50:14.000000000
-0500
@@ -8,7 +8,7 @@
# The apt-ftparchive program
ifdef BDBLIB
@@ -1269,20 +1251,18 @@
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
multicompress.cc
-diff -uNr apt-0.6.43.3/ftparchive-conf apt-0.6.43.3-new/ftparchive-conf
--- apt-0.6.43.3/ftparchive-conf 1969-12-31 19:00:00.000000000 -0500
-+++ apt-0.6.43.3-new/ftparchive-conf 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/ftparchive-conf 2006-03-14 06:50:14.000000000 -0500
@@ -0,0 +1 @@
+Dir::Bin::gzip "@PREFIX@/bin/gzip";
-diff -uNr apt-0.6.43.3/methods/makefile apt-0.6.43.3-new/methods/makefile
--- apt-0.6.43.3/methods/makefile 2005-11-28 04:55:47.000000000 -0500
-+++ apt-0.6.43.3-new/methods/makefile 2006-03-11 12:29:16.000000000 -0500
-@@ -7,61 +7,61 @@
++++ apt-0.6.43.3-new/methods/makefile 2006-03-14 06:53:45.000000000 -0500
+@@ -7,61 +7,62 @@
BIN := $(BIN)/methods
# FIXME..
--LIB_APT_PKG_MAJOR = 3.11
-+LIB_APT_PKG_MAJOR = 0.6.40
++COMPAT=3
+ LIB_APT_PKG_MAJOR = 3.11
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
@@ -1348,17 +1328,16 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.43.3/methods/rfc2553emu.h
apt-0.6.43.3-new/methods/rfc2553emu.h
--- apt-0.6.43.3/methods/rfc2553emu.h 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/methods/rfc2553emu.h 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/methods/rfc2553emu.h 2006-03-14 06:50:14.000000000
-0500
@@ -26,6 +26,11 @@
#include <sys/types.h>
#include <sys/socket.h>
-+// Always use full emulation on Darwin:
-+// netdb.h has the structures and constants, but getnameinfo() is missing
-+// and getaddrinfo() seems to be broken
-+#ifndef __APPLE__
++
++
++
++
+
// Autosense getaddrinfo
#if defined(AI_PASSIVE) && defined(EAI_NONAME)
@@ -1367,7 +1346,7 @@
#define HAVE_GETNAMEINFO
#endif
-+#endif /* __APPLE__ */
++
+
// getaddrinfo support?
#ifndef HAVE_GETADDRINFO
@@ -1382,9 +1361,8 @@
#define sockaddr_storage sockaddr_in
#endif
-diff -uNr apt-0.6.43.3/patch_flush apt-0.6.43.3-new/patch_flush
--- apt-0.6.43.3/patch_flush 1969-12-31 19:00:00.000000000 -0500
-+++ apt-0.6.43.3-new/patch_flush 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/patch_flush 2006-03-14 06:50:14.000000000 -0500
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
Index: apt.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/base/apt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.info 13 Mar 2006 21:05:14 -0000 1.1
+++ apt.info 14 Mar 2006 12:49:17 -0000 1.2
@@ -5,17 +5,17 @@
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
-Depends: apt0.6.40-shlibs (>= %v-%r), gzip, libftw0-shlibs
+Depends: libapt3-shlibs (>= %v-%r), gzip, libftw0-shlibs
BuildDepends: fink-prebinding, libftw0, libiconv-dev, libgettext3-dev,
gettext-tools
Conflicts: apt-ftparchive
Replaces: apt-ftparchive
GCC: 3.3
-Source: mirror:sourceforge:fink/%n_%v.tar.gz
+Source: http://debian.ethz.ch/debian/pool/main/a/%n/%n_%v.tar.gz
Source2: http://downloads.sleepycat.com/db-4.3.29.tar.gz
SourceDirectory: %n-%v
Source-MD5: 7d607342ffce8ba8705ae7797cb1a15c
-Source2-MD5: 200b9f5d74175875fcb3ee54adbf0007
+Source2-MD5: 13585a20ce32f113b8e8cdb57f52e3bb
PatchScript: <<
#!/bin/sh -ex
DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{
print $2 }'`
@@ -31,73 +31,72 @@
CompileScript: <<
#!/bin/sh -ex
- export DBDIR=`pwd`/../db-4.3.28
- pushd $DBDIR/build_unix
- LIBS="" LDFLAGS="" CFLAGS="" CXXFLAGS="" F77=no ../dist/configure
--enable-static=yes --enable-shared=no
- make libdb.a
- popd
+ export DBDIR=`pwd`/../db-4.3.29
+ pushd $DBDIR/build_unix
+ LIBS="" LDFLAGS="" CFLAGS="" CXXFLAGS="" F77=no ../dist/configure
--enable-static=yes --enable-shared=no
+ make libdb.a
+ popd
- export CPPFLAGS="-I$DBDIR/build_unix -I%p/include/ftw"
- export LDFLAGS="-L$DBDIR/build_unix"
- ./configure %c
- make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER= INTLLIBS="-L%p/lib
-lintl" BDBLIB="$DBDIR/build_unix/libdb.a"
+ export CPPFLAGS="-I$DBDIR/build_unix -I%p/include/ftw"
+ export LDFLAGS="-L$DBDIR/build_unix"
+ ./configure %c
+ make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER=
INTLLIBS="-L%p/lib -lintl" BDBLIB="$DBDIR/build_unix/libdb.a"
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/bin
- install -d -m 755 %i/lib
- install -d -m 755 %i/lib/apt/methods
- install -d -m 755 %i/lib/dpkg/methods/apt
- install -d -m 755 %i/include/apt-pkg
- install -d -m 755 %i/share/man/man{1,5,8}
- install -d -m 755 %i/etc/apt/apt.conf.d
- install -d -m 755 %i/var/cache/apt/archives/partial
- install -d -m 755 %i/var/lib/apt/lists/partial
-
- install -c -m 644 ftparchive-conf %i/etc/apt/apt.conf.d/
+ install -d -m 755 %i/bin
+ install -d -m 755 %i/lib
+ install -d -m 755 %i/lib/apt/methods
+ install -d -m 755 %i/lib/dpkg/methods/apt
+ install -d -m 755 %i/include/apt-pkg
+ install -d -m 755 %i/share/man/man{1,5,8}
+ install -d -m 755 %i/etc/apt/apt.conf.d
+ install -d -m 755 %i/var/cache/apt/archives/partial
+ install -d -m 755 %i/var/lib/apt/lists/partial
- for binfile in cache cdrom config extracttemplates ftparchive get sortpkgs; do
- install -c -m 755 bin/apt-$binfile %i/bin/
- done
+ # binaries
+ install -c -m 755 bin/apt-* %i/bin/
- install -c -m 644 bin/libapt-pkg.0.6.40.0.dylib %i/lib/
- pushd %i/lib/ && ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.0.6.40.dylib &&
ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.dylib && popd
- install -c -m 644 bin/libapt-inst.0.6.40.0.dylib %i/lib/
- pushd %i/lib/ && ln -s libapt-inst.0.6.40.0.dylib libapt-inst.0.6.40.dylib &&
ln -s libapt-inst.0.6.40.0.dylib libapt-inst.dylib && popd
+ # libraries
+ install -c -m 644 bin/libapt-pkg.3.11.0.dylib %i/lib/
+ pushd %i/lib/ && ln -s libapt-pkg.3.11.0.dylib libapt-pkg.3.dylib && ln
-s libapt-pkg.3.dylib libapt-pkg.dylib && popd
+ install -c -m 644 bin/libapt-inst.1.1.0.dylib %i/lib/
+ pushd %i/lib/ && ln -s libapt-inst.1.1.0.dylib libapt-inst.3.dylib &&
ln -s libapt-inst.1.dylib libapt-inst.dylib && popd
- for method in bin/methods/*; do
- install -c -m 755 $method %i/lib/apt/methods/
- done
+ # methods
+ install -c -m 755 bin/methods/* %i/lib/apt/methods/
+ install -c -m 755 scripts/dselect/* %i/lib/dpkg/methods/apt/
- for method in scripts/dselect/*; do
- install -c $method %i/lib/dpkg/methods/apt/
- done
+ # man pages
+ for ext in 1 5 8; do
+ for file in doc/*.$ext docs/*.$ext; do
+ install -c -m 644 $file %i/share/man/man$ext/
+ done
+ done
- install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
+ # configuration files
+ install -c -m 644 ftparchive-conf %i/etc/apt/apt.conf.d/
- for ext in 1 5 8; do
- for file in doc/*.$ext docs/*.$ext; do
- cp -f $file %i/share/man/man$ext/
- done
- done
+ # headers
+ install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
<<
DocFiles: COPYING* AUTHORS
SplitOff: <<
- Package: apt0.6.40-shlibs
+ Package: libapt3-shlibs
Depends: dpkg, fink (>= 0.20.6-1), libgettext3-shlibs
Replaces: apt-shlibs
DocFiles: COPYING* AUTHORS
- Files: lib/lib*0.6.40*.dylib
+ Files: lib/lib*.3*.dylib
Shlibs: <<
- %p/lib/libapt-pkg.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1)
- %p/lib/libapt-inst.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1)
+ %p/lib/libapt-pkg.3.dylib 3.0.0 libapt3-shlibs (>= 0.6.40.1-1)
+ %p/lib/libapt-inst.3.dylib 3.0.0 libapt3-shlibs (>= 0.6.40.1-1)
<<
<<
SplitOff2: <<
- Package: apt0.6.40-dev
- Depends: apt0.6.40-shlibs (>= %v-%r)
+ Package: libapt3-dev
+ Depends: libapt3-shlibs (>= %v-%r)
Conflicts: apt-dev
Replaces: apt-dev
Recommends: libiconv-dev, libgettext3-dev
@@ -108,21 +107,21 @@
PostInstScript: <<
if [ ! -f %p/var/lib/dpkg/cmethopt ]; then
- echo "apt apt" >%p/var/lib/dpkg/cmethopt
- chmod 644 %p/var/lib/dpkg/cmethopt
+ echo "apt apt" >%p/var/lib/dpkg/cmethopt
+ chmod 644 %p/var/lib/dpkg/cmethopt
else
- read a b <%p/var/lib/dpkg/cmethopt
- if [ "$a" != "apt" -o "$b" != "apt" ]; then
- echo
- echo "dselect is not set up to use apt as its access method. Downloading
binary"
- echo -n "package will likely not work. Do you want to use apt instead?"
- read answer
- answer=`echo $answer | sed 's/^[yY].*$/y/'`
- if [ -z "$answer" -o "x$answer" = "xy" ]; then
- echo "apt apt" >%p/var/lib/dpkg/cmethopt
- chmod 644 %p/var/lib/dpkg/cmethopt
- fi
- fi
+ read a b <%p/var/lib/dpkg/cmethopt
+ if [ "$a" != "apt" -o "$b" != "apt" ]; then
+ echo
+ echo "dselect is not set up to use apt as its access method.
Downloading binary"
+ echo -n "package will likely not work. Do you want to use apt
instead?"
+ read answer
+ answer=`echo $answer | sed 's/^[yY].*$/y/'`
+ if [ -z "$answer" -o "x$answer" = "xy" ]; then
+ echo "apt apt" >%p/var/lib/dpkg/cmethopt
+ chmod 644 %p/var/lib/dpkg/cmethopt
+ fi
+ fi
fi
rm -f %p/var/cache/apt/pkgcache.bin %p/var/cache/apt/srcpkgcache.bin
Index: apt-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/base/apt-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt-shlibs.info 13 Mar 2006 21:05:14 -0000 1.1
+++ apt-shlibs.info 14 Mar 2006 12:49:17 -0000 1.2
@@ -1,6 +1,6 @@
Package: apt-shlibs
Version: 0.5.4
-Revision: 73
+Revision: 75
Description: Shared libraries for APT
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
@@ -34,9 +34,9 @@
install -d -m 755 %i/include/apt-pkg
install -m 644 bin/libapt-pkg.3.2.0.dylib %i/lib/
- cd %i/lib/ && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.3.2.dylib && ln -s
libapt-pkg.3.2.0.dylib libapt-pkg.dylib
+ cd %i/lib/ && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.3.2.dylib && ln -s
libapt-pkg.3.2.dylib libapt-pkg.dylib
install -m 644 bin/libapt-inst.1.0.0.dylib %i/lib/
- cd %i/lib/ && ln -s libapt-inst.1.0.0.dylib libapt-inst.1.0.dylib && ln -s
libapt-inst.1.0.0.dylib libapt-inst.dylib
+ cd %i/lib/ && ln -s libapt-inst.1.0.0.dylib libapt-inst.1.0.dylib && ln -s
libapt-inst.1.0.dylib libapt-inst.dylib
install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
<<
@@ -44,8 +44,8 @@
SplitOff: <<
Package: apt-dev
Depends: %N (>= %v-%r)
- Conflicts: apt0.6.40-dev
- Replaces: apt0.6.40-dev
+ Conflicts: libapt3-dev
+ Replaces: libapt3-dev
Recommends: libiconv-dev, libgettext3-dev
BuildDependsOnly: true
DocFiles: COPYING* AUTHORS
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
