Update of /cvsroot/fink/experimental/dazjorz/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv10180
Modified Files:
apt.info apt.patch dpkg-bootstrap.info dpkg.info
Log Message:
Fix compilation of Apt using the Clang compiler. Rev-up.
Index: dpkg-bootstrap.info
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/dpkg-bootstrap.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dpkg-bootstrap.info 22 Dec 2011 22:04:45 -0000 1.2
+++ dpkg-bootstrap.info 29 Dec 2011 22:35:52 -0000 1.3
@@ -1,6 +1,6 @@
Package: dpkg-bootstrap
Version: 1.15.5.6
-Revision: 14
+Revision: 15
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Conflicts: dpkg
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/apt.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.patch 20 Aug 2011 12:29:56 -0000 1.6
+++ apt.patch 29 Dec 2011 22:35:52 -0000 1.7
@@ -1,6 +1,6 @@
diff -Nurd apt-0.7.25.3/apt-inst/contrib/extracttar.cc
apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc
--- apt-0.7.25.3/apt-inst/contrib/extracttar.cc 2010-02-01
20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-inst/contrib/extracttar.cc 2011-12-29
23:26:15.000000000 +0100
@@ -148,6 +148,18 @@
return true;
}
@@ -33,7 +33,7 @@
StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
diff -Nurd apt-0.7.25.3/apt-inst/deb/dpkgdb.cc
apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc
--- apt-0.7.25.3/apt-inst/deb/dpkgdb.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-inst/deb/dpkgdb.cc 2011-12-29
23:26:15.000000000 +0100
@@ -24,6 +24,7 @@
#include <errno.h>
#include <sys/stat.h>
@@ -44,7 +44,7 @@
#include <ctype.h>
diff -Nurd apt-0.7.25.3/apt-pkg/aptconfiguration.cc
apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc
--- apt-0.7.25.3/apt-pkg/aptconfiguration.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/aptconfiguration.cc 2011-12-29
23:26:15.000000000 +0100
@@ -36,8 +36,8 @@
_config->CndSet("Acquire::CompressionTypes::gz","gzip");
@@ -58,7 +58,7 @@
std::string const overrideOrder =
_config->Find("Acquire::CompressionTypes::Order","");
diff -Nurd apt-0.7.25.3/apt-pkg/contrib/fink.cc
apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc
--- apt-0.7.25.3/apt-pkg/contrib/fink.cc 1970-01-01 01:00:00.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/fink.cc 2011-12-29
23:26:15.000000000 +0100
@@ -0,0 +1,87 @@
+/* FINK LOCAL begin */
+#include <sys/utsname.h>
@@ -149,7 +149,7 @@
+/* FINK LOCAL end */
diff -Nurd apt-0.7.25.3/apt-pkg/contrib/macros.h
apt-0.7.25.3-patched/apt-pkg/contrib/macros.h
--- apt-0.7.25.3/apt-pkg/contrib/macros.h 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/macros.h 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/macros.h 2011-12-29
23:26:15.000000000 +0100
@@ -24,12 +24,6 @@
#define MAX(x,y) _max(x,y)
#endif
@@ -175,7 +175,7 @@
#define likely(x) __builtin_expect (!!(x), 1)
diff -Nurd apt-0.7.25.3/apt-pkg/contrib/mmap.cc
apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc
--- apt-0.7.25.3/apt-pkg/contrib/mmap.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/mmap.cc 2011-12-29
23:26:15.000000000 +0100
@@ -172,6 +172,13 @@
return;
@@ -192,7 +192,7 @@
int Map = MAP_PRIVATE | MAP_ANONYMOUS;
diff -Nurd apt-0.7.25.3/apt-pkg/contrib/netrc.cc
apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc
--- apt-0.7.25.3/apt-pkg/contrib/netrc.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/contrib/netrc.cc 2011-12-29
23:26:15.000000000 +0100
@@ -160,10 +160,18 @@
{
char login[64] = "";
@@ -237,9 +237,36 @@
}
}
}
+diff -Nurd apt-0.7.25.3/apt-pkg/deb/deblistparser.cc
apt-0.7.25.3-patched/apt-pkg/deb/deblistparser.cc
+--- apt-0.7.25.3/apt-pkg/deb/deblistparser.cc 2010-02-01 20:44:40.000000000
+0100
++++ apt-0.7.25.3-patched/apt-pkg/deb/deblistparser.cc 2011-12-29
23:26:47.000000000 +0100
+@@ -210,18 +210,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_ascii(*Start);
++ *J++ = tolower_ascii(*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 -Nurd apt-0.7.25.3/apt-pkg/deb/debsystem.cc
apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc
--- apt-0.7.25.3/apt-pkg/deb/debsystem.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.cc 2011-12-29
23:26:15.000000000 +0100
@@ -23,6 +23,12 @@
#include <unistd.h>
#include <dirent.h>
@@ -360,7 +387,7 @@
return false;
diff -Nurd apt-0.7.25.3/apt-pkg/deb/debsystem.h
apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h
--- apt-0.7.25.3/apt-pkg/deb/debsystem.h 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/debsystem.h 2011-12-29
23:26:15.000000000 +0100
@@ -12,6 +12,19 @@
#include <apt-pkg/pkgsystem.h>
@@ -391,7 +418,7 @@
diff -Nurd apt-0.7.25.3/apt-pkg/deb/dpkgpm.cc
apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc
--- apt-0.7.25.3/apt-pkg/deb/dpkgpm.cc 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/apt-pkg/deb/dpkgpm.cc 2011-12-29 23:26:15.000000000
+0100
@@ -22,6 +22,7 @@
#include <sys/select.h>
#include <sys/types.h>
@@ -448,7 +475,7 @@
diff -Nurd apt-0.7.25.3/apt-pkg/indexcopy.cc
apt-0.7.25.3-patched/apt-pkg/indexcopy.cc
--- apt-0.7.25.3/apt-pkg/indexcopy.cc 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/indexcopy.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/apt-pkg/indexcopy.cc 2011-12-29 23:26:15.000000000
+0100
@@ -603,8 +603,8 @@
const char *Args[400];
unsigned int i = 0;
@@ -462,7 +489,7 @@
diff -Nurd apt-0.7.25.3/apt-pkg/init.cc apt-0.7.25.3-patched/apt-pkg/init.cc
--- apt-0.7.25.3/apt-pkg/init.cc 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/init.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/apt-pkg/init.cc 2011-12-29 23:26:15.000000000
+0100
@@ -16,6 +16,8 @@
#include <config.h>
#include <cstdlib>
@@ -501,7 +528,7 @@
if (Label.empty() == false)
diff -Nurd apt-0.7.25.3/apt-pkg/makefile apt-0.7.25.3-patched/apt-pkg/makefile
--- apt-0.7.25.3/apt-pkg/makefile 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/apt-pkg/makefile 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/apt-pkg/makefile 2011-12-29 23:26:15.000000000
+0100
@@ -22,7 +22,7 @@
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
@@ -513,7 +540,7 @@
macros.h
diff -Nurd apt-0.7.25.3/apt-pkg/pkgcachegen.cc
apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc
--- apt-0.7.25.3/apt-pkg/pkgcachegen.cc 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/apt-pkg/pkgcachegen.cc 2011-12-29
23:26:15.000000000 +0100
@@ -827,7 +827,7 @@
MMap **OutMap,bool AllowMem)
{
@@ -525,7 +552,7 @@
for (vector<metaIndex *>::const_iterator i = List.begin();
diff -Nurd apt-0.7.25.3/buildlib/configure.mak
apt-0.7.25.3-patched/buildlib/configure.mak
--- apt-0.7.25.3/buildlib/configure.mak 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/buildlib/configure.mak 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/configure.mak 2011-12-29
23:26:15.000000000 +0100
@@ -28,7 +28,7 @@
aclocal -I buildlib
@@ -537,7 +564,7 @@
$(addprefix $(BUILDDIR)/,$(CONVERTED)):
diff -Nurd apt-0.7.25.3/buildlib/environment.mak.in
apt-0.7.25.3-patched/buildlib/environment.mak.in
--- apt-0.7.25.3/buildlib/environment.mak.in 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/buildlib/environment.mak.in 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/environment.mak.in 2011-12-29
23:26:15.000000000 +0100
@@ -11,8 +11,8 @@
NUM_PROCS = @NUM_PROCS@
@@ -572,7 +599,7 @@
+LFLAGS_SO=-dynamiclib
diff -Nurd apt-0.7.25.3/buildlib/library.mak
apt-0.7.25.3-patched/buildlib/library.mak
--- apt-0.7.25.3/buildlib/library.mak 2010-02-01 20:44:40.000000000 +0100
-+++ apt-0.7.25.3-patched/buildlib/library.mak 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/buildlib/library.mak 2011-12-29 23:26:15.000000000
+0100
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
@@ -629,7 +656,7 @@
diff -Nurd apt-0.7.25.3/buildlib/libversion.mak
apt-0.7.25.3-patched/buildlib/libversion.mak
--- apt-0.7.25.3/buildlib/libversion.mak 2010-02-01 20:44:40.000000000
+0100
-+++ apt-0.7.25.3-patched/buildlib/libversion.mak 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/buildlib/libversion.mak 2011-12-29
23:26:15.000000000 +0100
@@ -18,4 +18,5 @@
# want to drop this, but this a ABI break.
# And we don't want to do this now. So we hardcode a value here,
@@ -639,7 +666,7 @@
+LIBEXT=
diff -Nurd apt-0.7.25.3/cmdline/apt-get.cc
apt-0.7.25.3-patched/cmdline/apt-get.cc
--- apt-0.7.25.3/cmdline/apt-get.cc 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/cmdline/apt-get.cc 2011-08-20 14:22:26.000000000
+0200
++++ apt-0.7.25.3-patched/cmdline/apt-get.cc 2011-12-29 23:32:28.000000000
+0100
@@ -53,7 +53,12 @@
#include <termios.h>
#include <sys/ioctl.h>
@@ -761,6 +788,23 @@
{
c1out <<
_("Some packages could not be installed. This may mean that you
have\n"
+@@ -1843,12 +1881,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()) + " ";
+ VersionsList += string(Cache[I].CandVersion) + "\n";
+ }
@@ -2773,6 +2811,8 @@
_config->Set("APT::Get::Simulate",false);
_config->Set("APT::Get::Assume-Yes",false);
@@ -805,7 +849,7 @@
_config->Set("quiet","1");
diff -Nurd apt-0.7.25.3/cmdline/apt-key apt-0.7.25.3-patched/cmdline/apt-key
--- apt-0.7.25.3/cmdline/apt-key 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/cmdline/apt-key 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/cmdline/apt-key 2011-12-29 23:26:15.000000000
+0100
@@ -5,7 +5,7 @@
# We don't use a secret keyring, of course, but gpg panics and
@@ -832,7 +876,7 @@
for trusted in $(run-parts --list $TRUSTEDPARTS --regex
'^.*\.gpg$'); do
diff -Nurd apt-0.7.25.3/debian/bugscript apt-0.7.25.3-patched/debian/bugscript
--- apt-0.7.25.3/debian/bugscript 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/debian/bugscript 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/debian/bugscript 2011-12-29 23:26:15.000000000
+0100
@@ -11,14 +11,14 @@
EOF
@@ -852,7 +896,7 @@
if [ "$REPLY" = "yep" ]; then
diff -Nurd apt-0.7.25.3/doc/apt-get.8.xml
apt-0.7.25.3-patched/doc/apt-get.8.xml
--- apt-0.7.25.3/doc/apt-get.8.xml 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/apt-get.8.xml 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/doc/apt-get.8.xml 2011-12-29 23:26:15.000000000
+0100
@@ -344,6 +344,19 @@
Configuration Item:
<literal>APT::Get::Fix-Broken</literal>.</para></listitem>
</varlistentry>
@@ -875,7 +919,7 @@
<listitem><para>Ignore missing packages; If packages cannot be retrieved
or fail the
diff -Nurd apt-0.7.25.3/doc/examples/apt-https-method-example.conf
apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf
--- apt-0.7.25.3/doc/examples/apt-https-method-example.conf 2010-02-01
20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf
2011-08-20 14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/doc/examples/apt-https-method-example.conf
2011-12-29 23:26:15.000000000 +0100
@@ -59,11 +59,15 @@
// server certificate using its cert.
Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem";
@@ -912,7 +956,7 @@
diff -Nurd apt-0.7.25.3/doc/manpage-style.xsl
apt-0.7.25.3-patched/doc/manpage-style.xsl
--- apt-0.7.25.3/doc/manpage-style.xsl 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/doc/manpage-style.xsl 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/doc/manpage-style.xsl 2011-12-29 23:26:15.000000000
+0100
@@ -2,7 +2,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
@@ -924,7 +968,7 @@
diff -Nurd apt-0.7.25.3/dselect/install apt-0.7.25.3-patched/dselect/install
--- apt-0.7.25.3/dselect/install 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/install 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/dselect/install 2011-12-29 23:26:15.000000000
+0100
@@ -6,8 +6,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -938,7 +982,7 @@
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
diff -Nurd apt-0.7.25.3/dselect/setup apt-0.7.25.3-patched/dselect/setup
--- apt-0.7.25.3/dselect/setup 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/setup 2011-08-20 14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/dselect/setup 2011-12-29 23:26:15.000000000 +0100
@@ -23,15 +23,20 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
@@ -1015,7 +1059,7 @@
$answer =~ s/\s+/ /og;
diff -Nurd apt-0.7.25.3/dselect/update apt-0.7.25.3-patched/dselect/update
--- apt-0.7.25.3/dselect/update 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/dselect/update 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/dselect/update 2011-12-29 23:26:15.000000000
+0100
@@ -7,13 +7,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1036,7 +1080,7 @@
DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
diff -Nurd apt-0.7.25.3/fink/fink_unauthenticated.conf
apt-0.7.25.3-patched/fink/fink_unauthenticated.conf
--- apt-0.7.25.3/fink/fink_unauthenticated.conf 1970-01-01
01:00:00.000000000 +0100
-+++ apt-0.7.25.3-patched/fink/fink_unauthenticated.conf 2011-08-20
14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/fink/fink_unauthenticated.conf 2011-12-29
23:26:15.000000000 +0100
@@ -0,0 +1,9 @@
+# Fink's apt was updated in may 2010. It now features cryptographic signing of
+# packages, but Fink doesn't do this at all yet. In order to have a clean
@@ -1049,7 +1093,7 @@
+}
diff -Nurd apt-0.7.25.3/methods/connect.cc
apt-0.7.25.3-patched/methods/connect.cc
--- apt-0.7.25.3/methods/connect.cc 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/connect.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/methods/connect.cc 2011-12-29 23:26:15.000000000
+0100
@@ -107,7 +107,7 @@
// Check the socket for an error condition
@@ -1061,7 +1105,7 @@
diff -Nurd apt-0.7.25.3/methods/ftp.cc apt-0.7.25.3-patched/methods/ftp.cc
--- apt-0.7.25.3/methods/ftp.cc 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/ftp.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/methods/ftp.cc 2011-12-29 23:26:15.000000000
+0100
@@ -703,7 +703,7 @@
if (WaitFd(DataFd,true,TimeOut) == false)
return _error->Error(_("Could not connect data socket, connection
timed out"));
@@ -1073,7 +1117,7 @@
if (Err != 0)
diff -Nurd apt-0.7.25.3/methods/gpgv.cc apt-0.7.25.3-patched/methods/gpgv.cc
--- apt-0.7.25.3/methods/gpgv.cc 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/gpgv.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/methods/gpgv.cc 2011-12-29 23:26:15.000000000
+0100
@@ -59,8 +59,8 @@
string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
// FIXME: remove support for deprecated APT::GPGV setting
@@ -1087,7 +1131,7 @@
std::clog << "gpgv path: " << gpgvpath << std::endl;
diff -Nurd apt-0.7.25.3/methods/https.cc apt-0.7.25.3-patched/methods/https.cc
--- apt-0.7.25.3/methods/https.cc 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/https.cc 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/methods/https.cc 2011-12-29 23:26:15.000000000
+0100
@@ -151,12 +151,14 @@
default_verify = 0;
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
@@ -1120,7 +1164,7 @@
if(_config->FindB("Acquire::https::No-Cache",
diff -Nurd apt-0.7.25.3/methods/rfc2553emu.h
apt-0.7.25.3-patched/methods/rfc2553emu.h
--- apt-0.7.25.3/methods/rfc2553emu.h 2010-02-01 20:44:41.000000000 +0100
-+++ apt-0.7.25.3-patched/methods/rfc2553emu.h 2011-08-20 14:16:48.000000000
+0200
++++ apt-0.7.25.3-patched/methods/rfc2553emu.h 2011-12-29 23:26:15.000000000
+0100
@@ -26,6 +26,11 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -1154,7 +1198,7 @@
#endif
diff -Nurd apt-0.7.25.3/patch_flush apt-0.7.25.3-patched/patch_flush
--- apt-0.7.25.3/patch_flush 1970-01-01 01:00:00.000000000 +0100
-+++ apt-0.7.25.3-patched/patch_flush 2011-08-20 14:16:48.000000000 +0200
++++ apt-0.7.25.3-patched/patch_flush 2011-12-29 23:26:15.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/dpkg.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dpkg.info 22 Dec 2011 22:04:45 -0000 1.6
+++ dpkg.info 29 Dec 2011 22:35:52 -0000 1.7
@@ -1,6 +1,6 @@
Package: dpkg
Version: 1.15.5.6
-Revision: 14
+Revision: 15
GCC: 4.0
BuildDepends: fink (>= 0.24.12), libgettext8-dev, gettext-tools
Conflicts: dpkg-bootstrap
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/apt.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- apt.info 22 Dec 2011 22:04:45 -0000 1.10
+++ apt.info 29 Dec 2011 22:35:52 -0000 1.11
@@ -1,6 +1,6 @@
Package: apt
Version: 0.7.25.3
-Revision: 14
+Revision: 15
GCC: 4.0
BuildDepends: fink (>= 0.24.12), libtool2, docbook-xsl
Depends: %N-inst4-shlibs (= %v-%r), %N-pkg1-shlibs (= %v-%r), dpkg (>=
1.15.5.6-9)
@@ -8,7 +8,7 @@
Source-MD5: ee59a90b91764aefeb5eb0f29d5cab96
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 74a6a16dc3a1515bbf9f152589628fcd
+PatchFile-MD5: dcce69750d12839389c2c1983be112d6
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e "s|@PERLARCH32@|$VERSIONER_PERL_PREFER_32_BIT|" <
%{PatchFile} | patch -p1
sh patch_flush
@@ -17,8 +17,6 @@
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-SetCXX: llvm-g++-4.2
-SetCC: llvm-gcc-4.2
SetCXXFLAGS: -O2 -D__USE_MISC -fconstant-cfstrings
SetLDFLAGS: -liconv
ConfigureParams: --host=%m-apple-darwin`uname -r|cut -f1 -d.`
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
