Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs17:/tmp/cvs-serv12051/fink-branch_0_27/10.3
Modified Files:
Tag: branch_0_27
ChangeLog dpkg-bootstrap.info
Added Files:
Tag: branch_0_27
dpkg-bootstrap.patch
Log Message:
dpkg-bootstrap doesn't have on-board gettext, so nuke gettext stuff from .patch
Index: dpkg-bootstrap.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg-bootstrap.info,v
retrieving revision 1.16
retrieving revision 1.16.12.1
diff -u -d -r1.16 -r1.16.12.1
--- dpkg-bootstrap.info 23 Jun 2006 13:41:35 -0000 1.16
+++ dpkg-bootstrap.info 24 Oct 2007 05:13:45 -0000 1.16.12.1
@@ -5,8 +5,10 @@
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
-SetCFLAGS: -no-cpp-precomp -I%p/include
+PatchFile: %n.patch
+PatchFile-MD5: 78b236715ad6391f708a5776f43a65bf
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+SetCFLAGS: -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
--- NEW FILE: dpkg-bootstrap.patch ---
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
@@ -30,7 +30,6 @@
const char *canon;
};
-extern const struct fieldinfo fieldinfos[];
extern const struct nickname nicknames[];
extern const int nfields; /* = elements in fieldinfos, including the sentinels
*/
@@ -68,6 +67,8 @@
unsigned int integer;
};
+extern const struct fieldinfo fieldinfos[];
+
void parseerr(FILE *file, const char *filename, int lno, FILE *warnto, int
*warncount,
const struct pkginfo *pigp, int warnonly,
[...2513 lines suppressed...]
if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
- execlp(TAR,"tar","-cf", "-", "-T", "-", "--null", "--no-recursion",
(char*)0);
+ execlp(TAR,"tar","-cf", "-", "--null", "-T", "-", "--no-recursion",
(char*)0);
ohshite(_("failed to exec tar -cf"));
}
close(p1[0]);
diff -Naur dpkg-1.10.21/lib/mlib.c dpkg-new/lib/mlib.c
--- dpkg-1.10.21/lib/mlib.c 2007-03-10 12:20:35.000000000 -0500
+++ dpkg-new/lib/mlib.c 2007-03-10 15:13:48.000000000 -0500
@@ -110,7 +110,9 @@
if (WIFEXITED(status)) {
n= WEXITSTATUS(status); if (!n) return n;
if(!(flags & PROCNOERR)) {
- if(flags & PROCWARN)
+ /* FINK LOCAL: Tar status 1 is a warning. */
+ if((flags & PROCWARN) || (n == 1 && strncmp(description, "tar", 3) == 0))
+ /* FINK LOCAL */
fprintf(stderr, _("dpkg: warning - %s returned error exit status
%d\n"),description,n);
else
ohshit(_("subprocess %s returned error exit status %d"),description,n);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.3/ChangeLog,v
retrieving revision 1.37.10.1
retrieving revision 1.37.10.2
diff -u -d -r1.37.10.1 -r1.37.10.2
--- ChangeLog 10 Jun 2007 06:10:51 -0000 1.37.10.1
+++ ChangeLog 24 Oct 2007 05:13:36 -0000 1.37.10.2
@@ -1,3 +1,8 @@
+2007-10-24 Daniel Macks <[EMAIL PROTECTED]>
+
+ * dpkg-bootstrap.info, dpkg-bootstrap.patch: Remove
+ non-bootstrappy stuff from bootstrap's patch.
+
2007-06-09 Dave Morrison <[EMAIL PROTECTED]>
* apt.info dpkg.info dpkg.patch libiconv.info libiconv.patch
ncurses.info tar.info unzip.info unzip.patch: sync with stable
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
