--- getopt/Makefile.am.orig	Wed Jun 21 06:41:12 2006

+++ getopt/Makefile.am	Thu Oct 26 18:38:28 2006

@@ -13,5 +13,4 @@

 	error.h \

 	getopt.c getopt.h \

 	getopt1.c \

-	long-options.c long-options.h \

-	obstack.c obstack.h

+	long-options.c long-options.h

--- getopt/Makefile.in.orig	Fri Oct 13 06:37:54 2006

+++ getopt/Makefile.in	Thu Oct 26 18:35:34 2006

@@ -70,7 +70,7 @@

 libopt_a_AR = $(AR) $(ARFLAGS)

 libopt_a_LIBADD =

 am_libopt_a_OBJECTS = closeout.$(OBJEXT) getopt.$(OBJEXT) \

-	getopt1.$(OBJEXT) long-options.$(OBJEXT) obstack.$(OBJEXT)

+	getopt1.$(OBJEXT) long-options.$(OBJEXT) 

 libopt_a_OBJECTS = $(am_libopt_a_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

@@ -232,7 +232,6 @@

 	getopt.c getopt.h \

 	getopt1.c \

 	long-options.c long-options.h \

-	obstack.c obstack.h

 all: all-am

@@ -285,7 +284,6 @@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

--- lib/Makefile.am.orig	Thu Oct 26 18:38:08 2006

+++ lib/Makefile.am	Thu Oct 26 18:37:18 2006

@@ -34,4 +34,5 @@

 	tarfn.c tarfn.h \

 	utils.c \

 	varbuf.c \

-	vercmp.c

+	vercmp.c \

+	obstack.c obstack.h

--- lib/Makefile.in.orig	Fri Oct 13 06:37:55 2006

+++ lib/Makefile.in	Thu Oct 26 18:34:48 2006

@@ -75,7 +75,8 @@

 	md5.$(OBJEXT) mlib.$(OBJEXT) myopt.$(OBJEXT) \

 	nfmalloc.$(OBJEXT) parse.$(OBJEXT) parsehelp.$(OBJEXT) \

 	showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \

-	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)

+	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT) \

+	obstack.$(OBJEXT)

 libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

@@ -257,7 +258,8 @@

 	tarfn.c tarfn.h \

 	utils.c \

 	varbuf.c \

-	vercmp.c

+	vercmp.c \

+	obstack.c obstack.h

 all: all-am

@@ -326,6 +328,7 @@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varbuf.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vercmp.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

--- lib/utils.c.orig	Sat Apr 22 12:28:47 2006

+++ lib/utils.c	Sat Apr 22 12:29:37 2006

@@ -32,3 +32,12 @@

 int cisalpha(int c) {

 	return ((c>='a') && (c<='z')) || ((c>='A') && (c<='Z'));

 }

+

+#ifdef __FreeBSD__

+size_t

+strnlen (const char *string, size_t maxlen)

+{

+	const char *end = memchr (string, '\0', maxlen);

+	return end ? (size_t) (end - string) : maxlen;

+}

+#endif

--- scripts/Makefile.in.orig	Fri Oct 13 06:37:57 2006

+++ scripts/Makefile.in	Fri Nov 10 12:54:34 2006

@@ -282,6 +282,9 @@

 		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \

 		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \

 		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \

+		    -e "s:\$$sysconfdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$sysconfdir=\"$(sysconfdir)\":" \

+		    -e "s:\$$infodir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$infodir=\"$(infodir)\":" \

+		    -e "s:\$$prefix[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$prefix=\"$(prefix)\":" \

 		    -e "s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(PACKAGE_VERSION)\":"

 do_shell_subst = sed -e "s:version=\"[^\"]*\":version=\"$(PACKAGE_VERSION)\":"

--- scripts/cleanup-info.pl.orig	Tue Jun 20 19:36:39 2006

+++ scripts/cleanup-info.pl	Fri Nov 10 12:22:49 2006

@@ -25,6 +25,7 @@

 # use strict;

 my $dpkglibdir = "."; # This line modified by Makefile

+my $prefix = "/usr"; # This line modified by Makefile

 push(@INC,$dpkglibdir);

 require 'dpkg-gettext.pl';

 textdomain("dpkg");

@@ -56,7 +57,7 @@

 "), $0;

 }

-my $infodir = '/usr/info';

+my $infodir = "$prefix/info";

 my $unsafe = 0;

 $0 =~ m|[^/]+$|;

 my $name= $&;

--- scripts/dpkg-checkbuilddeps.pl.orig	Sun Jun 18 18:22:03 2006

+++ scripts/dpkg-checkbuilddeps.pl	Fri Nov 10 16:23:44 2006

@@ -4,7 +4,8 @@

 #use strict;

 use Getopt::Long;

-my $dpkglibdir="/usr/lib/dpkg";

+my $dpkglibdir="/usr/lib/dpkg"; # This line modified by Makefile

+my $admindir="/var/lib/dpkg"; # This line modified by Makefile

 push(@INC,$dpkglibdir);

 #my $controlfile;

 require 'controllib.pl';

@@ -79,7 +80,7 @@

 # thanks to Matt Zimmerman. Returns two hash references that

 # are exactly what the other functions need...

 sub parse_status {

-	my $status=shift || "/var/lib/dpkg/status";

+	my $status=shift || "$admindir/status";

 	my %providers;

 	my %version;

--- scripts/dpkg-genchanges.pl.orig	Wed Jun 28 17:14:04 2006

+++ scripts/dpkg-genchanges.pl	Mon Nov 13 21:29:46 2006

@@ -336,9 +336,9 @@

     open(STDIN,"< $uf") || &syserr(sprintf(_g("cannot open upload file %s for reading"), $uf));

     (@s=stat(STDIN)) || &syserr(sprintf(_g("cannot fstat upload file %s"), $uf));

     $size= $s[7]; $size || &warn(sprintf(_g("upload file %s is empty"), $uf));

-    $md5sum=`md5sum`; $? && subprocerr(sprintf(_g("md5sum upload file %s"), $uf));

+    $md5sum=`gmd5sum`; $? && subprocerr(sprintf(_g("gmd5sum upload file %s"), $uf));

     $md5sum =~ m/^([0-9a-f]{32})\s*-?\s*$/i ||

-        &failure(sprintf(_g("md5sum upload file %s gave strange output \`%s'"), $uf, $md5sum));

+        &failure(sprintf(_g("gmd5sum upload file %s gave strange output \`%s'"), $uf, $md5sum));

     $md5sum= $1;

     defined($md5sum{$f}) && $md5sum{$f} ne $md5sum &&

         &error(sprintf(_g("md5sum of source file %s (%s) is different ".

--- scripts/dpkg-scanpackages.pl.orig	Sun Jun 18 18:22:03 2006

+++ scripts/dpkg-scanpackages.pl	Mon Nov 13 21:30:48 2006

@@ -167,9 +167,9 @@

 	$tv{'Filename'}= "$pathprefix$fn";

-	open(C,"md5sum <$fn |") || die "$fn $!";

-	chop($_=<C>); close(C); $? and die sprintf(_g("\`md5sum < %s' exited with %d"), $fn, $?)."\n";

-	/^([0-9a-f]{32})\s*-?\s*$/ or die sprintf(_g("Strange text from \`md5sum < %s': \`%s'"), $fn, $_)."\n";

+	open(C,"gmd5sum <$fn |") || die "$fn $!";

+	chop($_=<C>); close(C); $? and die sprintf(_g("\`gmd5sum < %s' exited with %d"), $fn, $?)."\n";

+	/^([0-9a-f]{32})\s*-?\s*$/ or die sprintf(_g("Strange text from \`gmd5sum < %s': \`%s'"), $fn, $_)."\n";

 	$tv{'MD5sum'}= $1;

 	my @stat= stat($fn) or die sprintf(_g("Couldn't stat %s: %s"), $fn, $!)."\n";

--- scripts/dpkg-scansources.pl.orig	Sun Jun 18 18:22:03 2006

+++ scripts/dpkg-scansources.pl	Mon Nov 13 21:31:23 2006

@@ -298,11 +298,11 @@

     if (!$pid) {

 	open STDIN, '<&FILE' or xdie sprintf(_g("can't dup %s:"), $file);

 	seek STDIN, 0, 0     or xdie sprintf(_g("can't rewind %s:"), $file);

-	exec 'md5sum'        or xdie _g("can't exec md5sum:");

+	exec 'gmd5sum'        or xdie _g("can't exec gmd5sum:");

     }

     chomp($md5 = join '', <MD5>);

     unless (close MD5) {

-	xwarn_noerror close_msg 'md5sum';

+	xwarn_noerror close_msg 'gmd5sum';

 	return;

     }

     $md5 =~ s/ *-$//; # Remove trailing spaces and -, to work with GNU md5sum

--- scripts/dpkg-shlibdeps.pl.orig	Fri Nov 10 12:02:38 2006

+++ scripts/dpkg-shlibdeps.pl	Fri Nov 10 12:54:26 2006

@@ -3,16 +3,18 @@

 # dpkg-shlibdeps

 # $Id: dpkg-shlibdeps.pl,v 1.19.2.2 2004/04/25 17:11:41 keybuk Exp $

-my $dpkglibdir="/usr/lib/dpkg";

+my $dpkglibdir="/usr/lib/dpkg"; # This line modified by Makefile

+my $admindir="/var/lib/dpkg"; # This line modified by Makefile

+my $sysconfdir="/etc"; # This line modified by Makefile

 my $version="1.4.1.19"; # This line modified by Makefile

 use English;

 use POSIX qw(:errno_h :signal_h);

-my $shlibsoverride= '/etc/dpkg/shlibs.override';

-my $shlibsdefault= '/etc/dpkg/shlibs.default';

+my $shlibsoverride= "$sysconfdir/dpkg/shlibs.override";

+my $shlibsdefault= "$sysconfdir/etc/dpkg/shlibs.default";

 my $shlibslocal= 'debian/shlibs.local';

-my $shlibsppdir= '/var/lib/dpkg/info';

+my $shlibsppdir= "$admindir/info";

 my $shlibsppext= '.shlibs';

 my $varnameprefix= 'shlibs';

 my $dependencyfield= 'Depends';

--- scripts/dpkg-source.pl.orig	Tue Jun 20 20:40:27 2006

+++ scripts/dpkg-source.pl	Fri Nov 10 13:26:54 2006

@@ -1,6 +1,7 @@

 #! /usr/bin/perl

 my $dpkglibdir = ".";

+my $prefix = "/usr"; # This line modified by Makefile

 my $version = "1.3.0"; # This line modified by Makefile

 my @filesinarchive;

@@ -616,10 +617,17 @@

     close(DSC);

     if ($is_signed) {

-	if (-x '/usr/bin/gpg') {

+	my $have_gpg = 0;

+	foreach my $path (split ':', $ENV{PATH}) {

+	    if (-x "$path/gpg") {

+		$have_gpg = 1;

+		last;

+	    }

+	}

+	if ($have_gpg) {

 	    my $gpg_command = 'gpg -q --verify ';

-	    if (-r '/usr/share/keyrings/debian-keyring.gpg') {

-		$gpg_command = $gpg_command.'--keyring /usr/share/keyrings/debian-keyring.gpg ';

+	    if (-r "$prefix/share/apt/keyrings/freebsd-keyring.gpg") {

+		$gpg_command = $gpg_command."--keyring $prefix/share/apt/keyrings/freebsd-keyring.gpg ";

 	    }

 	    $gpg_command = $gpg_command.quotemeta($dsc).' 2>&1';

@@ -842,18 +850,18 @@

 	    open DIFF, $patch or &error(sprintf(_g("can't open diff `%s'"), $patch));

 	}

-        defined($c2= fork) || &syserr(_g("fork for patch"));

+        defined($c2= fork) || &syserr(_g("fork for gpatch"));

         if (!$c2) {

-            open(STDIN,"<&DIFF") || &syserr(_g("reopen gzip for patch"));

-            chdir($newdirectory) || &syserr(sprintf(_g("chdir to %s for patch"), $newdirectory));

+            open(STDIN,"<&DIFF") || &syserr(_g("reopen gzip for gpatch"));

+            chdir($newdirectory) || &syserr(sprintf(_g("chdir to %s for gpatch"), $newdirectory));

 	    $ENV{'LC_ALL'}= 'C';

 	    $ENV{'LANG'}= 'C';

-            exec('patch','-s','-t','-F','0','-N','-p1','-u',

-                 '-V','never','-g0','-b','-z','.dpkg-orig') or &syserr(_g("exec patch"));

+            exec('gpatch','-s','-t','-F','0','-N','-p1','-u',

+                 '-V','never','-g0','-b','-z','.dpkg-orig') or &syserr(_g("exec gpatch"));

         }

         close(DIFF);

-        $c2 == waitpid($c2,0) || &syserr(_g("wait for patch"));

-        $? && subprocerr("patch");

+        $c2 == waitpid($c2,0) || &syserr(_g("wait for gpatch"));

+        $? && subprocerr("gpatch");

 	&reapgzip if $patch =~ /\.(gz|bz2)$/;

     }

@@ -909,7 +917,7 @@

     open(STDIN,"< $dscdir/$f") || &syserr(sprintf(_g("cannot read %s"), "$dscdir/$f"));

     (@s= stat(STDIN)) || &syserr(sprintf(_g("cannot fstat %s"), "$dscdir/$f"));

     $s[7] == $size{$f} || &error(sprintf(_g("file %s has size %s instead of expected %s"), $f, $s[7], $size{$f}));

-    $m= `md5sum`; $? && subprocerr("md5sum $f"); $m =~ s/\n$//;

+    $m= `gmd5sum`; $? && subprocerr("gmd5sum $f"); $m =~ s/\n$//;

     $m = readmd5sum( $m );

     $m eq $md5sum{$f} || &error(sprintf(_g("file %s has md5sum %s instead of expected %s"), $f, $m, $md5sum{$f}));

     open(STDIN,"</dev/null") || &syserr(_g("reopen stdin from /dev/null"));

@@ -1334,8 +1342,8 @@

 	&internerr( sprintf(_g("tried to add file `%s' twice"), $filename));

     stat($filename) || &syserr(sprintf(_g("could not stat output file `%s'"), $filename));

     $size= (stat _)[7];

-    my $md5sum= `md5sum <$filename`;

-    $? && &subprocerr("md5sum $filename");

+    my $md5sum= `gmd5sum <$filename`;

+    $? && &subprocerr("gmd5sum $filename");

     $md5sum = readmd5sum( $md5sum );

     $f{'Files'}.= "\n $md5sum $size $filename";

 }

--- scripts/install-info.pl.orig	Tue Jun 20 19:36:39 2006

+++ scripts/install-info.pl	Fri Nov 10 15:33:54 2006

@@ -3,6 +3,8 @@

 use Text::Wrap;

 my $dpkglibdir = "."; # This line modified by Makefile

+my $prefix = "/usr"; # This line modified by Makefile

+my $infodir = "/usr/share/info"; # This line modified by Makefile

 push (@INC, $dpkglibdir);

 require 'dpkg-gettext.pl';

 textdomain("dpkg");

@@ -51,11 +53,11 @@

 "), $0;

 }

-$dirfile = '/usr/share/info/dir';

+$dirfile = "$infodir/dir";

 $maxwidth=79;

 $Text::Wrap::columns=$maxwidth;

 $backup='/var/backups/infodir.bak';

-$default='/usr/share/base-files/info.dir';

+$default="$prefix/share/base-files/info.dir";

 $menuentry="";

 $description="";

--- scripts/update-alternatives.pl.orig	Tue Jun 20 19:36:39 2006

+++ scripts/update-alternatives.pl	Fri Nov 10 13:57:31 2006

@@ -2,6 +2,7 @@

 $admindir= "/var/lib/dpkg"; # This line modified by Makefile

 $dpkglibdir= "../utils"; # This line modified by Makefile

+$sysconfdir="/etc"; # This line modified by Makefile

 $version= '0.93.80'; # This line modified by Makefile

 push (@INC, $dpkglibdir);

 require 'dpkg-gettext.pl';

@@ -64,7 +65,7 @@

   --set <name> <path>      set <path> as alternative for <name>.

   --all                    call --config on all alternatives.

-<link> is the symlink pointing to /etc/alternatives/<name>.

+<link> is the symlink pointing to $sysconfdir/alternatives/<name>.

   (e.g. /usr/bin/pager)

 <name> is the master name for this link group.

   (e.g. pager)

@@ -97,7 +98,7 @@

     exit(2);

 }

-$altdir= '/etc/alternatives';

+$altdir= $sysconfdir . '/alternatives';

 $admindir= $admindir . '/alternatives';

 $testmode= 0;

 $verbosemode= 0;

--- src/help.c.orig	Sun Jun 18 18:22:03 2006

+++ src/help.c	Mon Nov 13 21:09:32 2006

@@ -73,7 +73,7 @@

 #ifdef WITH_START_STOP_DAEMON

     "start-stop-daemon",

 #endif    

-    "install-info", "update-rc.d", 0

+    "dpkg-install-info", 0

   };

   struct stat stab;

--- src/remove.c.orig	Sun Jun 18 18:22:03 2006

+++ src/remove.c	Tue Nov 14 09:47:46 2006

@@ -261,7 +261,18 @@

         push_leftover(&leftover,namenode);

         continue;

       }

-      if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);

+      if (errno != ENOTDIR) {

+        /* dpkg includes /. in the packing list.

+         * rmdir("/.") will return EINVAL. dpkg will

+         * only attempt to remove /. when uninstalling

+         * the last package on the system, which is why

+         * Debian has never run into this issue. */

+        if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0) {

+          continue;

+        } else {

+          ohshite(_("cannot remove `%.250s'"),fnvb.buf);

+        }

+      }

       debug(dbg_eachfiledetail, "removal_bulk unlinking `%s'", fnvb.buf);

       {

         /*

@@ -378,7 +389,16 @@

       push_leftover(&leftover,namenode);

       continue;

     }

-    if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);

+    if (errno != ENOTDIR) {

+      /* As above, packages include /. in their packing list. 

+       * Even if we are removing the last package on the system, 

+       * don't try to remove /. */

+      if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0) {

+        continue;

+      } else {

+        ohshite(_("cannot remove `%.250s'"),fnvb.buf);

+      }

+    }

     push_leftover(&leftover,namenode);

     continue;

+#endif

libexec/dpkg/controllib.pl

libexec/dpkg/dpkg-gettext.pl

libexec/dpkg/enoent

@dirrmtry man/pt_BR/man1

@dirrmtry man/pt_BR/man5

@dirrmtry man/pt_BR/man8

@dirrmtry man/pt_BR

sbin/dpkg-statoverride

%%DATADIR%%/cputable

%%DATADIR%%/ostable

%%NLS%%share/locale/ca/LC_MESSAGES/dpkg.mo

%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES

%%NLS%%@dirrmtry share/locale/dz

%%NLS%%share/locale/fr/LC_MESSAGES/dpkg.mo

%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES

%%NLS%%@dirrmtry share/locale/km

%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES

%%NLS%%@dirrmtry share/locale/tl