Update of /cvsroot/fink/fink/10.4 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24204
Modified Files: ChangeLog dpkg.info dpkg.patch Log Message: sync with unstable Index: dpkg.patch =================================================================== RCS file: /cvsroot/fink/fink/10.4/dpkg.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dpkg.patch 8 Mar 2009 02:08:30 -0000 1.4 +++ dpkg.patch 4 Apr 2009 16:30:00 -0000 1.5 @@ -680,6 +680,35 @@ fprintf(stderr, _("dpkg: warning, architecture `%s' not in remapping table\n"),arch); } if (printf("%s\n",arch) == EOF) werr("stdout"); +diff -Nurd -x'*~' dpkg-1.10.21.orig/main/filesdb.c dpkg-1.10.21/main/filesdb.c +--- dpkg-1.10.21.orig/main/filesdb.c 2003-10-25 16:03:21.000000000 -0400 ++++ dpkg-1.10.21/main/filesdb.c 2009-04-01 00:57:26.000000000 -0400 +@@ -25,6 +25,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <string.h> ++#include <ctype.h> + #include <errno.h> + #include <sys/stat.h> + +@@ -566,7 +567,7 @@ + + static int hash(const char *name) { + int v= 0; +- while (*name) { v *= 1787; v += *name; name++; } ++ while (*name) { v *= 1787; v += tolower(*name); name++; } + return v; + } + +@@ -581,7 +582,7 @@ + while (*pointerp) { + /* Why is this assert nescessary? It is checking already added entries. */ + assert((*pointerp)->name[0] == '/'); +- if (!strcmp((*pointerp)->name+1,name)) break; ++ if (!strcasecmp((*pointerp)->name+1,name)) break; + pointerp= &(*pointerp)->next; + } + if (*pointerp) return *pointerp; diff -urN dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c --- dpkg-1.10.21.orig/main/help.c 2003-10-26 05:03:21.000000000 +0900 +++ dpkg-1.10.21/main/help.c 2005-03-18 22:13:37.000000000 +0900 Index: dpkg.info =================================================================== RCS file: /cvsroot/fink/fink/10.4/dpkg.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dpkg.info 21 Mar 2009 22:37:09 -0000 1.9 +++ dpkg.info 4 Apr 2009 16:30:00 -0000 1.10 @@ -1,6 +1,6 @@ Package: dpkg Version: 1.10.21 -Revision: 1226 +Revision: 1227 GCC: 4.0 BuildDepends: fink (>= 0.24.12) Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar, libncurses5-shlibs (>= 5.4-20041023-1006) @@ -12,7 +12,7 @@ Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz Source2-MD5: e2f6581626a22a0de66dce1d81d00de3 PatchFile: %n.patch -PatchFile-MD5: 5a4c81e659db6e3b0a20ded9cc8e75f8 +PatchFile-MD5: d420fc44aba5d66fc7452b872240a4df PatchScript: << cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0 cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh @@ -96,6 +96,9 @@ because libSystem has what dpkg needs, so just scrap it. Remove un/misused variable in dpkg enquiry.c (solve bus error in --architecture) + +Filesystem may be case-insensitive, so do case-insensitive check for +"dpkg -i" replacing files in an already-installed other package << # PostInstScript: << Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChangeLog 21 Mar 2009 22:37:09 -0000 1.19 +++ ChangeLog 4 Apr 2009 16:30:00 -0000 1.20 @@ -1,3 +1,7 @@ +2009-04-04 Dave Morrison <d...@finkproject.org> + + * dpkg.info, dpkg.patch: sync with unstable + 2009-03-21 Dave Morrison <d...@finkproject.org> * dpkg-bootstrap.info, dpkg.info: prepare for future needs ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs