Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22953/10.3
Modified Files:
ChangeLog dpkg-bootstrap.info dpkg.info dpkg.patch
fink-mirrors.info gettext.info
Log Message:
Sync bootstrap packages in HEAD w/stable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dpkg.patch 18 Mar 2005 13:46:12 -0000 1.7
+++ dpkg.patch 24 May 2006 02:19:08 -0000 1.8
@@ -1,3 +1,24 @@
+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,
+ const char *fmt, ...) PRINTFFORMAT(8,9);
+
diff -urN dpkg-1.10.21.orig/Makefile.conf.in dpkg-1.10.21/Makefile.conf.in
--- dpkg-1.10.21.orig/Makefile.conf.in 2003-09-14 08:43:49.000000000 +0900
+++ dpkg-1.10.21/Makefile.conf.in 2005-03-18 22:13:37.000000000 +0900
@@ -2437,3 +2458,69 @@
md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
- $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
+ $(CC) $(LDFLAGS) $(EXEFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
+diff -Nurd dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c
+--- dpkg-1.10.21.orig/main/help.c Sat Oct 25 16:03:21 2003
++++ dpkg-1.10.21/main/help.c Thu Mar 10 03:56:22 2005
+@@ -417,6 +417,26 @@
+
+ debug(dbg_veryverbose, "isdirectoryinuse `%s' (except %s)", file->name,
+ pkg ? pkg->name : "<none>");
++
++ /* FINK LOCAL begin */
++
++ /*
++ * Darwin has symlinks /etc -> /private/etc and /var -> /private/var
++ * instead of actual /etc and /var dirs. If dpkg removes the last
++ * pkg that it has record of having installed a file in one of those
++ * top-level dirs, it will try to remove the dir (since it thinks
++ * it's an empty dir) and it will succeed (since it's just unlinking
++ * a symlink, not trying to remove a dir that is not actually
++ * empty). That's Bad. Here we make sure these top-level dirs are
++ * never thought to be empty.
++ */
++ if( !strcmp(file->name,"/etc") || !strcmp(file->name,"/tmp") ||
!strcmp(file->name,"/var") ) {
++ debug(dbg_veryverbose, "isdirectoryinuse precious!");
++ return 1;
++ }
++
++ /* FINK LOCAL end */
++
+ for (packageslump= file->packages; packageslump; packageslump=
packageslump->more) {
+ debug(dbg_veryverbose, "isdirectoryinuse packageslump %s ...",
+ packageslump->pkgs[0] ? packageslump->pkgs[0]->name : "<none>");
+diff -ur dpkg-1.10.21.orig/include/dpkg.h.in dpkg-1.10.21/include/dpkg.h.in
+--- dpkg-1.10.21.orig/include/dpkg.h.in 2004-04-24 17:14:21.000000000
-0400
++++ dpkg-1.10.21/include/dpkg.h.in 2005-03-18 01:59:16.000000000 -0500
+@@ -118,13 +118,13 @@
+
+ #define ARCHIVE_FILENAME_PATTERN "*.deb"
+
+-#define BACKEND "dpkg-deb"
+-#define DPKGQUERY "dpkg-query"
+-#define SPLITTER "dpkg-split"
+-#define MD5SUM "md5sum"
+-#define DSELECT "dselect"
+-#define DPKG "dpkg"
+-#define DEBSIGVERIFY "/usr/bin/debsig-verify"
++#define BACKEND "@PREFIX@/bin/dpkg-deb"
++#define DPKGQUERY "@PREFIX@/bin/dpkg-query"
++#define SPLITTER "@PREFIX@/bin/dpkg-split"
++#define MD5SUM "@PREFIX@/bin/md5sum"
++#define DSELECT "@PREFIX@/bin/dselect"
++#define DPKG "@PREFIX@/bin/dpkg"
++#define DEBSIGVERIFY "@PREFIX@/bin/debsig-verify"
+
+ #define TAR "tar"
+ #define GZIP "gzip"
+diff -ruN dpkg-1.10.21/lib/mlib.c dpkg-1.10.21-patched/lib/mlib.c
+--- dpkg-1.10.21/lib/mlib.c 2004-03-08 12:13:09.000000000 -0500
++++ dpkg-1.10.21-patched/lib/mlib.c 2005-06-20 04:10:00.000000000 -0400
+@@ -189,7 +189,7 @@
+ switch(data->type) {
+ case BUFFER_WRITE_BUF:
+ memcpy(data->data.ptr, buf, length);
+- (char*)data->data.ptr += length;
++ data->data.ptr = (char*)data->data.ptr + length;
+ break;
+ case BUFFER_WRITE_VBUF:
+ varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
Index: gettext.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/gettext.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gettext.info 5 Apr 2005 17:38:49 -0000 1.9
+++ gettext.info 24 May 2006 02:19:08 -0000 1.10
@@ -19,6 +19,8 @@
so modifications of .info files will be made to accomodate this change.
<<
Patch: %n.patch
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man
--with-included-gettext
SetLDFLAGS: -L%b/intl/.libs
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.3/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog 24 Jan 2006 03:14:49 -0000 1.32
+++ ChangeLog 24 May 2006 02:19:08 -0000 1.33
@@ -1,3 +1,7 @@
+2006-05-23 Daniel Macks <[EMAIL PROTECTED]>
+
+ * dpkg*: sync w/stable
+
2006-01-23 Daniel Macks <[EMAIL PROTECTED]>
* gzip*: rename files from %f to %n
Index: fink-mirrors.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/fink-mirrors.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fink-mirrors.info 15 Aug 2005 17:11:03 -0000 1.8
+++ fink-mirrors.info 24 May 2006 02:19:08 -0000 1.9
@@ -1,9 +1,9 @@
Package: fink-mirrors
-Version: 0.24.8.1
+Version: 0.24.10.2
Revision: 1
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
+Source-MD5: be92f5997ba56b1fa25198b885e906b4
Depends: fink (>= 0.17.3-1)
Replaces: fink (<< 0.17.2-1)
CompileScript: sed -e "s|@PREFIX@|%p|g" < postinstall.pl.in > postinstall.pl
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dpkg.info 30 Jun 2005 19:08:49 -0000 1.19
+++ dpkg.info 24 May 2006 02:19:08 -0000 1.20
@@ -1,10 +1,8 @@
Package: dpkg
Version: 1.10.21
-Revision: 202
+Revision: 217
GCC: 3.3
-Depends: gzip, tar, ncurses (>= 5.4-20041023-4)
-BuildDepends: fink (>= 0.23.4-1), gettext-dev, libiconv-dev, libncurses5
-AddShlibDeps: true
+Depends: gettext, libiconv, gzip, tar, libncurses5-shlibs
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
@@ -15,7 +13,7 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
- %p/bin/fink -y --no-use-binary-dist install gettext-bin gettext-dev
libiconv-dev libncurses5
+ %p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev
libncurses5
PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
make EXEFLAGS=-force_flat_namespace
<<
@@ -51,6 +49,11 @@
Patched to suppress warning about BuildDependsOnly control field.
Previous versions by Christoph Pfisterer.
+
+Patched to not remove Darwin's system-critical symlinks (/etc /tmp /var)
+
+Patched to hardcode complete paths to our component executables
+instead of relying on PATH
<<
#
PostInstScript: <<
Index: dpkg-bootstrap.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg-bootstrap.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dpkg-bootstrap.info 21 Mar 2005 02:38:25 -0000 1.11
+++ dpkg-bootstrap.info 24 May 2006 02:19:08 -0000 1.12
@@ -1,9 +1,8 @@
Package: dpkg-bootstrap
Version: 1.10.21
-Revision: 201
+Revision: 217
Depends: gzip, tar
BuildDepends: gettext-dev
-AddShlibDeps: true
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
@@ -12,11 +11,11 @@
SetCFLAGS: -no-cpp-precomp -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-ConfigureParams: --without-zlib --without-dselect --without-start-stop-daemon
--without-sgml-doc --with-admindir=%P/var/lib/dpkg --mandir=%p/share/man
--infodir=%p/share/info --srcdir=%b
CompileScript: <<
PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
make EXEFLAGS=-force_flat_namespace
<<
+ConfigureParams: --without-zlib --without-dselect --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
@@ -29,12 +28,29 @@
intended to be used during bootstrap.
<<
DescPort: <<
-Uses autoconf.
+1.10.9
+- Removed --without-zlib flag
+- Gets confused about top_srcdir without the --srcdir arg.
+- Fixed bug with BR manpage
+- Patched update-rc.d out of the app check code, not needed on OS X.
-Needs fixes to use the right architecture, disable code that uses
+Pre-Jaguar: Needed fixes to use the right architecture, disable code that uses
unimplemented functions on Darwin and other stuff.
+Added code to support the pseudo package 'macosx' and 'darwin'.
+
+Fix to install-info script to prevent a certain problem with section titles.
+
+Patched to run 'fink-virtual-pkgs' to see what packages we have outside of
$prefix.
+
+Patched to suppress warning about BuildDependsOnly control field.
+
Previous versions by Christoph Pfisterer.
+
+Patched to not remove Darwin's system-critical symlinks (/etc /tmp /var)
+
+Patched to hardcode complete paths to our component executables
+instead of relying on PATH
<<
License: GPL
Homepage: http://packages.qa.debian.org/d/dpkg.html
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
