Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5158
Modified Files:
dpkg.info dpkg.patch
Log Message:
Sync w/unstable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/dpkg.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dpkg.patch 7 Aug 2006 22:48:46 -0000 1.8
+++ dpkg.patch 22 Mar 2007 18:05:07 -0000 1.9
@@ -2524,6 +2524,32 @@
break;
case BUFFER_WRITE_VBUF:
varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
+diff -Nurd -x'*~' dpkg-1.10.21.orig/dpkg-deb/build.c
dpkg-1.10.21/dpkg-deb/build.c
+--- dpkg-1.10.21.orig/dpkg-deb/build.c 2003-10-25 16:03:21.000000000 -0400
++++ dpkg-1.10.21/dpkg-deb/build.c 2006-12-18 04:52:19.000000000 -0500
+@@ -445,7 +445,7 @@
+ m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
+ m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
+ 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);
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 2003-10-25 16:03:21.000000000 +0400
+++ dpkg-1.10.21/main/help.c 2005-03-18 22:13:37.000000000 +0900
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/dpkg.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dpkg.info 7 Aug 2006 22:48:46 -0000 1.9
+++ dpkg.info 22 Mar 2007 18:05:07 -0000 1.10
@@ -1,18 +1,21 @@
Package: dpkg
Version: 1.10.21
-Revision: 221.1
+Revision: 223.1
GCC: 3.3
+BuildDepends: fink (>= 0.24.12)
Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-6)
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-#Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
-#Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchFile: %n.patch
+PatchFile-MD5: 270400071b828d9333ef3758a4b9545c
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
-#cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+ 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
<<
SetCFLAGS: -no-cpp-precomp -I%p/include
NoSetMAKEFLAGS: true
@@ -21,13 +24,11 @@
if [ $UID -ne 0 ]; then echo "dpkg cannot be built with --build-as-nobody";
exit 1; fi
%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; 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
- PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ 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
<<
-#ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b
-ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b --without-dselect --disable-nls
+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
@@ -54,7 +55,8 @@
it is built only so that msgfmt and xgettext are available during the
dpkg build. The only alternative would be to make gettext-tools an essential
pakcages, since essential packages cannot depend or builddepend on
- non-essential packages.
+ non-essential packages. Only build this gettext static, since don't need the
+ actual libs themselves.
<<
DescPort: <<
1.10.9
@@ -81,11 +83,18 @@
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
+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
+
Patched off-by-one bug in main/help.c:preexecscript argv processing
(backported from upstream dpkg-1.13.16)
-Patched to use %p/lib/fink/dpkg-wrappers/ wrappers for .deb scripts.
-BUG: if no .deb script, wrapper isn't run.
+Patched to use %p/lib/fink/dpkg-wrappers/ wrappers for .deb scripts
+(for use with the dpkg-wrappers CVS branch of the base-files module)
+NB: if no .deb script, wrapper isn't run.
<<
#
PostInstScript: <<
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
