Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv28514
Modified Files:
dpkg.info dpkg.patch
Log Message:
new dpkg, a few of my patches where accepted upstream. update-alternative
tests still fail, still working on figuring out why since it works 100% only
the tests fail.
dpkg (1.16.9)
[ Raphaël Hertzog ]
* Fix dpkg-source regression in "3.0 (quilt)" source packages while
unapplying patches that remove all files in a directory. Closes: #683547
* Fix segfault in field format parsing on empty strings, affecting
«dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». LP: #1035512
* Fix dpkg's French usage string which was missing the final âsâ in
--print-foreign-architectures. Closes: #685863
[ Guillem Jover ]
* Use âstatoverridesâ instead of âstatusoverridesâ in
dpkg-statoverride.
Closes: #686995
* Comment out dpkg(1) documentation about disabled --command-fd option.
Closes: #685677
* Cleanup dpkg-divert unit-test environment to avoid build failures.
Closes: #687656
* Fix update-alternatives test suite to behave correctly on non-Debian
binary paths. Known to be affecting at least Gentoo and Mac OS X.
* Do not leak subcall command arguments in update-alternatives.
* Fix segfault on update-alternatives when passing --slave without any
action at all. LP: #1037431
* Fix memory leak in dpkg filesavespackage().
* Do not print garbage (or worse) on dpkg shared conffile debug output.
* Use a hash instead of a ref to a hash for keys() in Dpkg::BuildFlags
get_feature_areas(). This causes compilation failures with older perl
versions, which can be an issue with partial upgrades.
* Fix filter subpattern debug output format string to print an actual
value instead of just blanks.
* Ignore trailing filter subpattern slashes on reinclusion comparison.
This makes sure to reinclude directories previously excluded so that
contained files marked for inclusion do not fail to unpack due to a
missing directory. Closes: #688416
* Do not consider obsolete conffiles as actively owned by the package.
This ensures conffile entries are not misshandled nor mixed up when
configuring packages owning the non-obsolete conffiles. Closes: #689836
Based on a patch by Andreas Beckmann <[email protected]>.
* Properly mark in the database obsolete conffiles on package replaces.
* Sync the Conffiles field values for all package instances. Because
only the first package instance being configured will have a *.dpkg-new
conffile available to be processed, the subsequent ones need to use the
hash from the previously processed entries.
* Fix logic for previously configured conffiles, so that the shared
conffile checks actually work on reinstallation. Closes: #684776
* Avoid info database corruption and bogus accesses on unknown format
values, by always reading the format file and validating it.
* Clarify that the most probable reason for multiarch database
inconcistencies is due to upgrades from unofficial dpkg versions.
* Only satisfy a dependency on a âMulti-Arch: foreignâ if
arch-unqualified.
* Take architecture into account in virtual packages on remove and
configure dpkg actions. Closes: #683411
* Update update-alternatives --query format and examples in man page to
match the implementation.
* Add two missing 3rd person âsâ in dpkg-gensymbols(1). Closes: #689863
Thanks to Paul Menzel <[email protected]>.
* Fix regression on old-style binNMUs for packages that specify an
explicit binary version to dpkg-gencontrol, by always fixing up the
source version. Closes: #690823
[ Updated programs translations ]
* Catalan (Guillem Jover).
* Czech (Miroslav Kure).
* Danish (Joe Dalton). Closes: #690808
* French (Christian Perrier).
* German (Sven Joachim).
* Italian (Milo Casagrande).
* Japanese (Kenshi Muto).
* Polish (MichaÅ KuÅach). Closes: #690449
* Portuguese (Miguel Figueiredo). Closes: #682582, #690431
* Russian (Yuri Kozlov). Closes: #688050, #690415
* Slovak (Ivan Masár). Closes: #690426
* Swedish (Peter Krefting).
* Thai (Theppitak Karoonboonyanan). Closes: #690678
* Traditional Chinese (imacat). Closes: #687002
[ Updated scripts translations ]
* Polish (MichaÅ KuÅach). Closes: #683104
* Spanish (Omar Campagne). Closes: #685297
[ Updated dselect translations ]
* Basque (Iñaki Larrañaga Murgoitio). Closes: #686421
* Czech (Miroslav Kure).
* Danish (Joe Dalton). Closes: #689820
* Polish (MichaÅ KuÅach).
[ Updated man page translations ]
* French (Thomas Vincent, Sylvestre Ledru, Christian Perrier).
Closes: #682978, #683221
* German (Helge Kreutzmann).
* Japanese (Hideki Yamane). Closes: #685103
* Polish (MichaÅ KuÅach).
* Spanish (Omar Campagne, Guillem Jover). Closes: #683514
* Swedish (Peter Krefting).
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- dpkg.patch 27 Aug 2012 22:59:34 -0000 1.16
+++ dpkg.patch 31 Oct 2012 15:20:36 -0000 1.17
@@ -1,6 +1,6 @@
-diff -ruN dpkg-1.16.8.orig/fink/md5sum dpkg-1.16.8/fink/md5sum
---- dpkg-1.16.8.orig/fink/md5sum 1969-12-31 17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/md5sum 2012-07-02 16:14:45.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/md5sum dpkg-1.16.9/fink/md5sum
+--- dpkg-1.16.9.orig/fink/md5sum 1969-12-31 17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/md5sum 2012-07-02 16:14:45.000000000 -0600
@@ -0,0 +1,313 @@
+#!/usr/bin/perl
+use strict;
@@ -315,16 +315,16 @@
+ }
+ }
+}
-diff -ruN dpkg-1.16.8.orig/fink/origins dpkg-1.16.8/fink/origins
---- dpkg-1.16.8.orig/fink/origins 1969-12-31 17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/origins 2012-07-02 16:14:45.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/origins dpkg-1.16.9/fink/origins
+--- dpkg-1.16.9.orig/fink/origins 1969-12-31 17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/origins 2012-07-02 16:14:45.000000000 -0600
@@ -0,0 +1,3 @@
+Vendor: Fink
+Vendor-URL: http://fink.sourceforge.net/
+Bugs: http://fink.sourceforge.net/
-diff -ruN dpkg-1.16.8.orig/fink/patches/add-BOD.patch
dpkg-1.16.8/fink/patches/add-BOD.patch
---- dpkg-1.16.8.orig/fink/patches/add-BOD.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/add-BOD.patch 2012-07-09 15:39:48.000000000
-0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/add-BOD.patch
dpkg-1.16.9/fink/patches/add-BOD.patch
+--- dpkg-1.16.9.orig/fink/patches/add-BOD.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/add-BOD.patch 2012-07-09 15:39:48.000000000
-0600
@@ -0,0 +1,32 @@
+diff -ruN dpkg-1.16.4.3.orig/dpkg-deb/build.c dpkg-1.16.4.3/dpkg-deb/build.c
+--- dpkg-1.16.4.3.orig/dpkg-deb/build.c 2012-06-13 23:18:31.000000000
-0600
@@ -358,9 +358,9 @@
+ /* Always accept fields starting with a private field prefix. */
+ if (strncasecmp(field->name, private_prefix, strlen(private_prefix)) == 0)
+ return true;
-diff -ruN dpkg-1.16.8.orig/fink/patches/build-fix.patch
dpkg-1.16.8/fink/patches/build-fix.patch
---- dpkg-1.16.8.orig/fink/patches/build-fix.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/build-fix.patch 2012-08-22 15:34:39.000000000
-0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/build-fix.patch
dpkg-1.16.9/fink/patches/build-fix.patch
+--- dpkg-1.16.9.orig/fink/patches/build-fix.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/build-fix.patch 2012-08-22 15:34:39.000000000
-0600
@@ -0,0 +1,198 @@
+diff -ruN dpkg-1.16.4.3.orig/configure dpkg-1.16.4.3/configure
+--- dpkg-1.16.4.3.orig/configure 2012-06-17 02:57:17.000000000 -0600
@@ -560,9 +560,9 @@
+ for (path = path_list; path; path = path_end ? path_end + 1 : NULL) {
+ path_end = strchr(path, ':');
+ path_len = path_end ? (size_t)(path_end - path) : strlen(path);
-diff -ruN dpkg-1.16.8.orig/fink/patches/c++filt-defaults.patch
dpkg-1.16.8/fink/patches/c++filt-defaults.patch
---- dpkg-1.16.8.orig/fink/patches/c++filt-defaults.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/c++filt-defaults.patch 2012-07-09
16:11:49.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/c++filt-defaults.patch
dpkg-1.16.9/fink/patches/c++filt-defaults.patch
+--- dpkg-1.16.9.orig/fink/patches/c++filt-defaults.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/c++filt-defaults.patch 2012-07-09
16:11:49.000000000 -0600
@@ -0,0 +1,12 @@
+diff -ruN dpkg-1.16.4.3.orig/scripts/Dpkg/Shlibs/Cppfilt.pm
dpkg-1.16.4.3/scripts/Dpkg/Shlibs/Cppfilt.pm
+--- dpkg-1.16.4.3.orig/scripts/Dpkg/Shlibs/Cppfilt.pm 2012-06-09
08:32:08.000000000 -0600
@@ -576,72 +576,9 @@
+ from_pipe => \$filt->{from},
+ to_pipe => \$filt->{to});
+ internerr(_g("unable to execute %s"), "c++filt")
-diff -ruN dpkg-1.16.8.orig/fink/patches/dpkg_fix_test_paths.patch
dpkg-1.16.8/fink/patches/dpkg_fix_test_paths.patch
---- dpkg-1.16.8.orig/fink/patches/dpkg_fix_test_paths.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/dpkg_fix_test_paths.patch 2012-08-26
11:16:02.000000000 -0600
-@@ -0,0 +1,59 @@
-+diff --git a/utils/t/100_update_alternatives.t
b/utils/t/100_update_alternatives.t
-+index 40a5990..4a78677 100644
-+--- a/utils/t/100_update_alternatives.t
-++++ b/utils/t/100_update_alternatives.t
-+@@ -260,7 +260,8 @@ check_choice(0, "auto", "initial install 3");
-+ open(FILE, "<", "$admindir/generic-test") or die $!;
-+ my $content = <FILE>;
-+ close(FILE);
-+- is($content,
-++
-++ my $expected =
-+ "auto
-+ $bindir/generic-test
-+ slave1
-+@@ -272,26 +273,28 @@ $bindir/slave3
-+ slave4
-+ $bindir/slave4
-+
-+-$paths{false}
-+-10
-+-$paths{date}
-+-
-+-
-+-
-+-$paths{sleep}
-+-5
-+-
-++";
-+
-++ my %slaves;
-+
-++ # Store slaves in a hash to easily retrieve present and missing ones.
-++ foreach my $alt (@choices) {
-++ foreach my $slave (@{$alt->{slaves}}) {
-++ $slaves{$slave->{name}}{$alt->{path}} = $slave;
-++ }
-++ }
-+
-+-$paths{true}
-+-20
-+-$paths{yes}
-+-$paths{cat}
-+-$paths{cat}
-+-$paths{cat}
-++ foreach my $alt (sort { $a->{path} cmp $b->{path} } @choices) {
-++ $expected .= $alt->{path} . "\n";
-++ $expected .= $alt->{priority} . "\n";
-++ foreach my $slave_name (sort keys %slaves) {
-++ $expected .= $slaves{$slave_name}{$alt->{path}}{path} || "";
-++ $expected .= "\n";
-++ }
-++ }
-++ $expected .= "\n";
-+
-+-", "administrative file is as expected");
-++ is($content, $expected, "administrative file is as expected");
-+ }
-+
-+ # manual change with --set-selections
-diff -ruN dpkg-1.16.8.orig/fink/patches/dselect-methods.patch
dpkg-1.16.8/fink/patches/dselect-methods.patch
---- dpkg-1.16.8.orig/fink/patches/dselect-methods.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/dselect-methods.patch 2012-07-09
15:48:55.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/dselect-methods.patch
dpkg-1.16.9/fink/patches/dselect-methods.patch
+--- dpkg-1.16.9.orig/fink/patches/dselect-methods.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/dselect-methods.patch 2012-07-09
15:48:55.000000000 -0600
@@ -0,0 +1,93 @@
+diff -ruN dpkg-1.16.4.3.orig/dselect/methods/Debian/Dselect/Ftp.pm
dpkg-1.16.4.3/dselect/methods/Debian/Dselect/Ftp.pm
+--- dpkg-1.16.4.3.orig/dselect/methods/Debian/Dselect/Ftp.pm 2012-06-13
23:12:30.000000000 -0600
@@ -736,9 +673,9 @@
+ package by using `dpkg --install --auto-deconfigure'\'' by hand.
+
+ ";
-diff -ruN dpkg-1.16.8.orig/fink/patches/fink-as-vendor.patch
dpkg-1.16.8/fink/patches/fink-as-vendor.patch
---- dpkg-1.16.8.orig/fink/patches/fink-as-vendor.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/fink-as-vendor.patch 2012-07-31
15:46:48.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/fink-as-vendor.patch
dpkg-1.16.9/fink/patches/fink-as-vendor.patch
+--- dpkg-1.16.9.orig/fink/patches/fink-as-vendor.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/fink-as-vendor.patch 2012-07-31
15:46:48.000000000 -0600
@@ -0,0 +1,101 @@
+--- a/scripts/Dpkg/Vendor/Fink.pm 2012-07-31 15:29:11.000000000 -0600
++++ b/scripts/Dpkg/Vendor/Fink.pm 2012-07-31 14:57:25.000000000 -0600
@@ -841,9 +778,9 @@
++}
++
++1;
-diff -ruN dpkg-1.16.8.orig/fink/patches/fink-triggers.patch
dpkg-1.16.8/fink/patches/fink-triggers.patch
---- dpkg-1.16.8.orig/fink/patches/fink-triggers.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/fink-triggers.patch 2012-08-22
15:45:46.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/fink-triggers.patch
dpkg-1.16.9/fink/patches/fink-triggers.patch
+--- dpkg-1.16.9.orig/fink/patches/fink-triggers.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/fink-triggers.patch 2012-08-22
15:45:46.000000000 -0600
@@ -0,0 +1,238 @@
+diff -ruN dpkg-1.16.4.3.orig/src/script.c dpkg-1.16.4.3/src/script.c
+--- dpkg-1.16.4.3.orig/src/script.c 2012-06-13 23:12:34.000000000 -0600
@@ -1083,9 +1020,9 @@
+ if (stat(cidir, &stab)) {
+ command_destroy(&cmd);
+ if (errno == ENOENT)
-diff -ruN dpkg-1.16.8.orig/fink/patches/fink-virtuals.patch
dpkg-1.16.8/fink/patches/fink-virtuals.patch
---- dpkg-1.16.8.orig/fink/patches/fink-virtuals.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/fink-virtuals.patch 2012-08-22
15:37:19.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/fink-virtuals.patch
dpkg-1.16.9/fink/patches/fink-virtuals.patch
+--- dpkg-1.16.9.orig/fink/patches/fink-virtuals.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/fink-virtuals.patch 2012-08-22
15:37:19.000000000 -0600
@@ -0,0 +1,546 @@
+diff -ruN dpkg-1.16.4.3.orig/dselect/main.cc dpkg-1.16.4.3/dselect/main.cc
+--- dpkg-1.16.4.3.orig/dselect/main.cc 2012-06-13 23:12:30.000000000
-0600
@@ -1633,9 +1570,9 @@
+ if (possi->cyclebreak) {
+ debug(dbg_depcondetail," break cycle so ok and found");
+ found = found_ok;
-diff -ruN dpkg-1.16.8.orig/fink/patches/full-path-calls.patch
dpkg-1.16.8/fink/patches/full-path-calls.patch
---- dpkg-1.16.8.orig/fink/patches/full-path-calls.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/full-path-calls.patch 2012-07-09
16:10:10.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/full-path-calls.patch
dpkg-1.16.9/fink/patches/full-path-calls.patch
+--- dpkg-1.16.9.orig/fink/patches/full-path-calls.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/full-path-calls.patch 2012-07-09
16:10:10.000000000 -0600
@@ -0,0 +1,44 @@
+diff -ruN dpkg-1.16.4.3.orig/dselect/dselect.h dpkg-1.16.4.3/dselect/dselect.h
+--- dpkg-1.16.4.3.orig/dselect/dselect.h 2012-06-13 23:12:30.000000000
-0600
@@ -1681,9 +1618,9 @@
+
+ #define TAR "tar"
+ #define RM "rm"
-diff -ruN dpkg-1.16.8.orig/fink/patches/gzip-rsyncable-fix.patch
dpkg-1.16.8/fink/patches/gzip-rsyncable-fix.patch
---- dpkg-1.16.8.orig/fink/patches/gzip-rsyncable-fix.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/gzip-rsyncable-fix.patch 2012-07-09
15:51:46.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/gzip-rsyncable-fix.patch
dpkg-1.16.9/fink/patches/gzip-rsyncable-fix.patch
+--- dpkg-1.16.9.orig/fink/patches/gzip-rsyncable-fix.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/gzip-rsyncable-fix.patch 2012-07-09
15:51:46.000000000 -0600
@@ -0,0 +1,16 @@
+diff -ruN dpkg-1.16.4.3.orig/scripts/Dpkg/Compression.pm
dpkg-1.16.4.3/scripts/Dpkg/Compression.pm
+--- dpkg-1.16.4.3.orig/scripts/Dpkg/Compression.pm 2012-06-13
23:12:33.000000000 -0600
@@ -1701,9 +1638,9 @@
+ "decomp_prog" => [ "gunzip" ],
+ "default_level" => 9,
+ },
-diff -ruN dpkg-1.16.8.orig/fink/patches/location-fixes.patch
dpkg-1.16.8/fink/patches/location-fixes.patch
---- dpkg-1.16.8.orig/fink/patches/location-fixes.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/location-fixes.patch 2012-08-22
15:39:58.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/location-fixes.patch
dpkg-1.16.9/fink/patches/location-fixes.patch
+--- dpkg-1.16.9.orig/fink/patches/location-fixes.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/location-fixes.patch 2012-08-22
15:39:58.000000000 -0600
@@ -0,0 +1,184 @@
+diff -ruN dpkg-1.16.4.3.orig/dpkg-split/queue.c
dpkg-1.16.4.3/dpkg-split/queue.c
+--- dpkg-1.16.4.3.orig/dpkg-split/queue.c 2012-06-13 23:12:30.000000000
-0600
@@ -1889,14 +1826,14 @@
+ }
+
+ execv(WRAPPED, argv);
-diff -ruN dpkg-1.16.8.orig/fink/patches/protect-system-dirs.patch
dpkg-1.16.8/fink/patches/protect-system-dirs.patch
---- dpkg-1.16.8.orig/fink/patches/protect-system-dirs.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/protect-system-dirs.patch 2012-08-23
10:59:32.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/protect-system-dirs.patch
dpkg-1.16.9/fink/patches/protect-system-dirs.patch
+--- dpkg-1.16.9.orig/fink/patches/protect-system-dirs.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/protect-system-dirs.patch 2012-10-31
09:08:22.000000000 -0600
@@ -0,0 +1,29 @@
+diff -ruN dpkg-1.16.4.3.orig/src/help.c dpkg-1.16.4.3/src/help.c
+--- dpkg-1.16.4.3.orig/src/help.c 2012-06-13 23:12:34.000000000 -0600
++++ dpkg-1.16.4.3/src/help.c 2012-07-02 16:14:45.000000000 -0600
-+@@ -265,6 +265,25 @@
++@@ -267,6 +267,25 @@
+ debug(dbg_veryverbose, "dir_is_used_by_others '%s' (except %s)",
file->name,
+ pkg ? pkg_name(pkg, pnaw_always) : "<none>");
+
@@ -1922,9 +1859,9 @@
+ iter = filepackages_iter_new(file);
+ while ((other_pkg = filepackages_iter_next(iter))) {
+ debug(dbg_veryverbose, "dir_is_used_by_others considering %s ...",
-diff -ruN dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch
dpkg-1.16.8/fink/patches/so-to-dylib.patch
---- dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/so-to-dylib.patch 2012-08-27 16:52:49.000000000
-0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch
dpkg-1.16.9/fink/patches/so-to-dylib.patch
+--- dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/so-to-dylib.patch 2012-08-27 16:52:49.000000000
-0600
@@ -0,0 +1,160 @@
+diff -ruN dpkg-1.16.8.orig/scripts/Dpkg/Shlibs/Objdump.pm
dpkg-1.16.8.new/scripts/Dpkg/Shlibs/Objdump.pm
+--- dpkg-1.16.8.orig/scripts/Dpkg/Shlibs/Objdump.pm 2012-07-19
06:27:39.000000000 -0600
@@ -2086,9 +2023,9 @@
+ Dpkg::Shlibs::Objdump::is_elf($_);
+ } map { "$libdir/$_" } readdir(DIR);
+ close(DIR);
-diff -ruN dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch.old
dpkg-1.16.8/fink/patches/so-to-dylib.patch.old
---- dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch.old 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/so-to-dylib.patch.old 2012-08-24
15:22:15.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch.old
dpkg-1.16.9/fink/patches/so-to-dylib.patch.old
+--- dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch.old 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/so-to-dylib.patch.old 2012-08-24
15:22:15.000000000 -0600
@@ -0,0 +1,39 @@
+diff -ruN dpkg-1.16.4.3.orig/scripts/dpkg-gensymbols.pl
dpkg-1.16.4.3/scripts/dpkg-gensymbols.pl
+--- dpkg-1.16.4.3.orig/scripts/dpkg-gensymbols.pl 2012-06-13
23:12:34.000000000 -0600
@@ -2129,9 +2066,9 @@
+ package Dpkg::Shlibs::Objdump::Object;
+
+ use Dpkg::Gettext;
-diff -ruN dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch.old2
dpkg-1.16.8/fink/patches/so-to-dylib.patch.old2
---- dpkg-1.16.8.orig/fink/patches/so-to-dylib.patch.old2 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/so-to-dylib.patch.old2 2012-08-27
14:11:24.000000000 -0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch.old2
dpkg-1.16.9/fink/patches/so-to-dylib.patch.old2
+--- dpkg-1.16.9.orig/fink/patches/so-to-dylib.patch.old2 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/so-to-dylib.patch.old2 2012-08-27
14:11:24.000000000 -0600
@@ -0,0 +1,272 @@
+--- dpkg-1.16.8.orig/scripts/Dpkg/Shlibs/Objdump.pm 2012-07-19
06:27:39.000000000 -0600
++++ dpkg-1.16.8.new/scripts/Dpkg/Shlibs/Objdump.pm 2012-08-27
14:10:29.000000000 -0600
@@ -2405,14 +2342,14 @@
+ # Write out symbols files
+ if ($stdout) {
+ $output = _g("<standard output>");
-diff -ruN dpkg-1.16.8.orig/fink/patches/test-fix.patch
dpkg-1.16.8/fink/patches/test-fix.patch
---- dpkg-1.16.8.orig/fink/patches/test-fix.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/test-fix.patch 2012-08-23 10:56:05.000000000
-0600
+diff -ruN dpkg-1.16.9.orig/fink/patches/test-fix.patch
dpkg-1.16.9/fink/patches/test-fix.patch
+--- dpkg-1.16.9.orig/fink/patches/test-fix.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.9/fink/patches/test-fix.patch 2012-10-31 09:11:35.000000000
-0600
@@ -0,0 +1,20 @@
+diff -ruN dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t
dpkg-1.16.4.3/src/t/100_dpkg_divert.t
+--- dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t 2012-06-13
23:12:34.000000000 -0600
++++ dpkg-1.16.4.3/src/t/100_dpkg_divert.t 2012-07-02 16:14:45.000000000
-0600
-+@@ -589,6 +589,7 @@
++@@ -593,6 +593,7 @@
+ expect_failure => 1, expect_stderr_like => qr/Permission
denied/);
+ diversions_eq('');
+
@@ -2420,7 +2357,7 @@
+ cleanup();
+ }
+
-+@@ -602,7 +603,7 @@
++@@ -606,7 +607,7 @@
+ system("chmod 500 $admindir");
+ call_divert(["$testdir/foo"], expect_failure => 1, expect_stderr_like =>
qr/create.*new/);
+ system("chmod 755 $admindir; ln -s /dev/full $admindir/diversions-new");
@@ -2429,101 +2366,3 @@
+ }
+
+ system("rm -f $admindir/diversions-new; mkdir $admindir/diversions-old");
-diff -ruN dpkg-1.16.8.orig/fink/patches/update-alternative.patch
dpkg-1.16.8/fink/patches/update-alternative.patch
---- dpkg-1.16.8.orig/fink/patches/update-alternative.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.8/fink/patches/update-alternative.patch 2012-08-22
15:42:01.000000000 -0600
-@@ -0,0 +1,94 @@
-+diff -ruN dpkg-1.16.4.3.orig/utils/update-alternatives.c
dpkg-1.16.4.3/utils/update-alternatives.c
-+--- dpkg-1.16.4.3.orig/utils/update-alternatives.c 2012-06-17
02:27:15.000000000 -0600
-++++ dpkg-1.16.4.3/utils/update-alternatives.c 2012-07-03 10:27:16.000000000
-0600
-+@@ -1223,21 +1223,16 @@
-+ }
-+ ctx->modified = true;
-+ } else {
-+- char *prio_str, *prio_end;
-+- long prio;
-++ char *endptr, *prio;
-++ long int iprio;
-+
-+- prio_str = altdb_get_line(ctx, _("priority"));
-+- errno = 0;
-+- prio = strtol(prio_str, &prio_end, 10);
-+- /* XXX: Leak master_file/prio_str on non-fatal error */
-+- if (prio_str == prio_end || *prio_end != '\0')
-++ prio = altdb_get_line(ctx, _("priority"));
-++ iprio = strtol(prio, &endptr, 10);
-++ /* XXX: Leak master_file/prio on non-fatal error */
-++ if (*endptr != '\0')
-+ ctx->bad_format(ctx, _("priority of %s: %s"),
-+- master_file, prio_str);
-+- if (prio < INT_MIN || prio > INT_MAX || errno == ERANGE)
-+- ctx->bad_format(ctx,
-+- _("priority of %s is out of range: %s"),
-+- master_file, prio_str);
-+- fs = fileset_new(master_file, prio);
-++ master_file, prio);
-++ fs = fileset_new(master_file, (int) iprio);
-+ for (sl = a->slaves; sl; sl = sl->next) {
-+ fileset_add_slave(fs, xstrdup(sl->name),
-+ altdb_get_line(ctx, _("slave file")));
-+@@ -1578,10 +1573,7 @@
-+ selection[strlen(selection) - 1] = '\0';
-+ if (strlen(selection) == 0)
-+ return current;
-+- errno = 0;
-+ idx = strtol(selection, &ret, 10);
-+- if (idx < 0 || errno != 0)
-+- continue;
-+ if (*ret == '\0') {
-+ /* Look up by index */
-+ if (idx == 0) {
-+@@ -1608,6 +1600,8 @@
-+ }
-+ }
-+ }
-++ free(current);
-++ return NULL;
-+ }
-+
-+ static void
-+@@ -2466,35 +2460,24 @@
-+ opt_verbose--;
-+ PUSH_OPT(argv[i]);
-+ } else if (strcmp("--install", argv[i]) == 0) {
-+- char *prio_str, *prio_end;
-+- long prio;
-++ long priority;
-++ char *endptr;
-+
-+ set_action("install");
-+ if (MISSING_ARGS(4))
-+ badusage(_("--install needs <link> <name> "
-+ "<path> <priority>"));
-+-
-+- prio_str = argv[i + 4];
-+-
-+ if (strcmp(argv[i+1], argv[i+3]) == 0)
-+ badusage(_("<link> and <path> can't be the
same"));
-+- errno = 0;
-+- prio = strtol(prio_str, &prio_end, 10);
-+- if (prio_str == prio_end || *prio_end != '\0')
-++ priority = strtol(argv[i+4], &endptr, 10);
-++ if (*endptr != '\0')
-+ badusage(_("priority must be an integer"));
-+- if (prio < INT_MIN || prio > INT_MAX || errno ==
ERANGE) {
-+- /* XXX: Switch back to error on 1.17.x. */
-+- prio = clamp(prio, INT_MIN, INT_MAX);
-+- warning(_("priority is out of range: "
-+- "%s clamped to %ld"),
-+- prio_str, prio);
-+- }
-+
-+ a = alternative_new(argv[i + 2]);
-+ inst_alt = alternative_new(argv[i + 2]);
-+ alternative_set_status(inst_alt, ALT_ST_AUTO);
-+ alternative_set_link(inst_alt, xstrdup(argv[i + 1]));
-+- fileset = fileset_new(argv[i + 3], prio);
-++ fileset = fileset_new(argv[i + 3], priority);
-+
-+ i += 4;
-+ } else if (strcmp("--remove", argv[i]) == 0 ||
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dpkg.info 27 Aug 2012 22:59:34 -0000 1.33
+++ dpkg.info 31 Oct 2012 15:20:36 -0000 1.34
@@ -1,5 +1,5 @@
Package: dpkg
-Version: 1.16.8
+Version: 1.16.9
Revision: 1
GCC: 4.0
## Remove po4a
@@ -13,10 +13,10 @@
Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.xz
SourceDirectory: dpkg-%v
-Source-MD5: 9f8042561ecccd5124e5958a1e181de7
+Source-MD5: 4df9319b2d17e19cdb6fe94dacee44da
PatchFile: %n.patch
-PatchFile-MD5: d8605bafd8f9d6c4e3d80f705699ada6
+PatchFile-MD5: a9932d2527a62b1fb10196e24116a94c
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -32,9 +32,7 @@
patch -p1 < fink/patches/location-fixes.patch
patch -p1 < fink/patches/protect-system-dirs.patch
patch -p1 < fink/patches/so-to-dylib.patch
-patch -p1 < fink/patches/dpkg_fix_test_paths.patch
patch -p1 < fink/patches/test-fix.patch
-#patch -p1 < fink/patches/update-alternative.patch
patch -p1 < fink/patches/fink-as-vendor.patch
# Remove po4a and make sure it can't be found if it's installed
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
