Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11040
Modified Files:
dpkg.info dpkg.patch
Log Message:
sync with unstable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/dpkg.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dpkg.patch 27 Mar 2007 15:08:30 -0000 1.10
+++ dpkg.patch 18 May 2009 04:26:21 -0000 1.11
@@ -1,3 +1,37 @@
+diff -ruN gettext-0.14.5/gettext-tools/lib/execute.c
gettext-0.14.5-patched/gettext-tools/lib/execute.c
+--- gettext-0.14.5/gettext-tools/lib/execute.c 2005-05-20 13:19:48.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/execute.c 2006-08-14
05:21:26.000000000 -0700
+@@ -62,7 +62,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
+diff -ruN gettext-0.14.5/gettext-tools/lib/pipe.c
gettext-0.14.5-patched/gettext-tools/lib/pipe.c
+--- gettext-0.14.5/gettext-tools/lib/pipe.c 2005-05-20 13:25:23.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/pipe.c 2006-08-14
05:22:02.000000000 -0700
+@@ -61,7 +61,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
diff -ruN dpkg-1.10.21/include/parsedump.h
dpkg-1.10.21-patched/include/parsedump.h
--- dpkg-1.10.21/include/parsedump.h 2002-05-06 12:18:16.000000000 -0400
+++ dpkg-1.10.21-patched/include/parsedump.h 2005-06-09 20:47:46.000000000
-0400
@@ -154,7 +188,7 @@
+ char name[256];
+ char version[256];
+ char revision[256];
-+ unsigned long epoch;
++ unsigned int epoch;
+ Boolean status;
+ SInt32 errorCode;
+ CFURLRef fileURL = NULL;
@@ -625,6 +659,56 @@
+See \...@prefix@/share/doc/dpkg/THANKS.gz\fP for the list of people who have
contributed to \fBdpkg\fP .
.fi
+diff -urN dpkg-1.10.21.orig/main/enquiry.c dpkg-1.10.21/main/enquiry.c
+--- dpkg-1.10.21.orig/main/enquiry.c 2003-10-25 16:03:21.000000000 -0400
++++ dpkg-1.10.21/main/enquiry.c 2008-08-21 11:38:24.000000000 -0400
+@@ -402,7 +402,7 @@
+ FILE *ccpipe;
+ struct varbuf vb;
+ ptrdiff_t ll;
+- char *p, *q;
++ char *p;
+
+ if (*argv) badusage(_("--print-architecture does not take any argument"));
+
+@@ -445,7 +445,7 @@
+ default: internerr("unknown action in printarch");
+ }
+ if (!arch) {
+- *q= 0; arch= p;
++ arch= p;
+ 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
@@ -685,7 +769,7 @@
+ char name[256];
+ char version[256];
+ char revision[256];
-+ unsigned long epoch;
++ unsigned int epoch;
+ Boolean status;
+ SInt32 errorCode;
+ CFURLRef fileURL = NULL;
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/dpkg.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dpkg.info 27 Mar 2007 15:08:30 -0000 1.11
+++ dpkg.info 18 May 2009 04:26:21 -0000 1.12
@@ -1,9 +1,9 @@
Package: dpkg
Version: 1.10.21
-Revision: 223.2
-GCC: 3.3
+Revision: 1228.1
+GCC: 4.0
BuildDepends: fink (>= 0.24.12)
-Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-6)
+Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
Essential: yes
Maintainer: Fink Core Group <fink-c...@lists.sourceforge.net>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
@@ -12,12 +12,14 @@
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
PatchFile: %n.patch
-PatchFile-MD5: 9ef447352d7437097ba16a7ce65ab74c
+PatchFile-MD5: 0df17df230dd6f43ac614e1acc757eb3
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
+ cd optlib; perl -pi -e 's/(getopt|getopt1).c//g' Makefile.in; rm getopt*
+ echo "x86_64-darwin darwin-x86_64 darwin-x86_64" >> %b/archtable
<<
-SetCFLAGS: -no-cpp-precomp -I%p/include
+SetCFLAGS: -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
@@ -26,12 +28,12 @@
%p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev libncurses5
cd %b/../gettext-0.14.5/gettext-tools; env EMACS=no ./configure
--prefix="%b/../_inst%p" --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --with-included-gettext --disable-csharp
--disable-rpath --disable-shared; make; rm -rf %b/../_inst; make install
PERL=/usr/bin/perl ac_cv_path_MSGFMT="%b/../_inst%p/bin/msgfmt"
ac_cv_path_XGETTEXT="%b/../_inst%p/bin/xgettext" ./configure
--build=%m-apple-darwin %c
- make
+ /usr/bin/make
<<
ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b
InstallScript: <<
mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
+ /usr/bin/make install DESTDIR=%d
install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
rm -rf %i/lib/dpkg/methods/*
mkdir -p -m0755 %i/lib/fink/dpkg-wrappers
@@ -83,12 +85,22 @@
Patched to hardcode complete paths to our component executables
instead of relying on PATH
-Patch 'dpkg -b' tar invovation to avoid warning under tar>=1.16
+Patch 'dpkg -b' tar invocation to avoid warning under tar>=1.16
See: http://permalink.gmane.org/gmane.os.apple.fink.core/1281
Patch 'dpkg -b' tar invocation to not die if tar returns exit code 1.
(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi
+Fink's make-3.81-1 breaks compiling so use Apple's to be safe.
+
+The on-board getopt needs tweaking for darwin, but isn't needed at all
+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
+
Patched off-by-one bug in main/help.c:preexecscript argv processing
(backported from upstream dpkg-1.13.16)
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
