diff -ruN apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h apt-0.5.15lorg3.93.new/apt-pkg/contrib/sha1.h
--- apt-0.5.15lorg3.93/apt-pkg/contrib/sha1.h   2007-05-14 05:01:55.000000000 -0400
+++ apt-0.5.15lorg3.93.new/apt-pkg/contrib/sha1.h       2007-09-19 10:43:53.177721000 -0400
@@ -48,9 +48,9 @@
 class SHA1Summation
 {
    /* assumes 64-bit alignment just in case */
-   unsigned char Buffer[64] __attribute__((aligned(8)));
-   unsigned char State[5*4] __attribute__((aligned(8)));
-   unsigned char Count[2*4] __attribute__((aligned(8)));
+   unsigned char Buffer[64] /* __attribute__((aligned(8))) */ ;
+   unsigned char State[5*4] /* __attribute__((aligned(8))) */ ;
+   unsigned char Count[2*4] /* __attribute__((aligned(8))) */ ;
    bool Done;
    
    public:
diff -ruN apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h apt-0.5.15lorg3.93.new/apt-pkg/pkgcachegen.h
--- apt-0.5.15lorg3.93/apt-pkg/pkgcachegen.h    2007-05-14 05:01:55.000000000 -0400
+++ apt-0.5.15lorg3.93.new/apt-pkg/pkgcachegen.h        2007-09-19 16:09:27.524355000 -0400
@@ -59,7 +59,7 @@
    public:
 
    // CNC:2003-02-27 - We need this in rpmListParser.
-   bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,string Name);
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());};
diff -ruN apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmhandler.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmhandler.cc        2007-08-17 06:49:37.000000000 -0400
+++ apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmhandler.cc    2007-09-19 14:05:44.879185000 -0400
@@ -60,6 +60,12 @@
 #define rpmxxInitIterator(a,b,c,d) rpmdbInitIterator(a,b,c,d)
 #endif
 
+#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
+#define RPMSENSE_MISSINGOK (1 << 19)
+#endif
+
 // An attempt to deal with false zero epochs from repomd. With older rpm's we
 // can only blindly trust the repo admin created the repository with options
 // suitable for those versions. For rpm >= 4.2.1 this is linked with
diff -ruN apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpackagedata.h apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmpackagedata.h
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmpackagedata.h     2007-05-14 05:01:55.000000000 -0400
+++ apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmpackagedata.h 2007-09-19 15:09:01.633396000 -0400
@@ -39,7 +39,7 @@
    map<string,vector<string>*> FakeProvides;
    map<string,int> IgnorePackages;
    map<string,int> DuplicatedPackages;
-   map<string,bool> > CompatArch;
+   map<string,bool> CompatArch;
    typedef map<string,pkgCache::VerIterator> VerMapValueType;
    typedef map<unsigned long,VerMapValueType> VerMapType;
    typedef map<const char*,int,cstr_lt_pred> ArchScoresType;
diff -ruN apt-0.5.15lorg3.93/apt-pkg/rpm/rpmversion.cc apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmversion.cc
--- apt-0.5.15lorg3.93/apt-pkg/rpm/rpmversion.cc        2007-05-14 05:01:55.000000000 -0400
+++ apt-0.5.15lorg3.93.new/apt-pkg/rpm/rpmversion.cc    2007-09-19 14:07:22.235951000 -0400
@@ -32,6 +32,11 @@
 #include <rpm/rpmds.h>
 #endif
 
+#if RPM_VERSION >= 0x040409 && !defined(_RPMEVR_INTERNAL)
+// rpmevr.h/evrFlags_e
+#define RPMSENSE_ANY 0
+#endif
+
 rpmVersioningSystem rpmVS;
 
 // rpmVS::rpmVersioningSystem - Constructor                            /*{{{*/
diff -ruN apt-0.5.15lorg3.93/methods/gpg.cc apt-0.5.15lorg3.93.new/methods/gpg.cc
--- apt-0.5.15lorg3.93/methods/gpg.cc   2007-05-14 05:01:55.000000000 -0400
+++ apt-0.5.15lorg3.93.new/methods/gpg.cc       2007-09-19 17:50:08.101210000 -0400
@@ -206,9 +235,9 @@
       dup2(fd[1], STDOUT_FILENO);
       dup2(fd[1], STDERR_FILENO);
       
-      unsetenv("LANG");
-      unsetenv("LC_ALL");
-      unsetenv("LC_MESSAGES");
+      putenv("LANG=");
+      putenv("LC_ALL=");
+      putenv("LC_MESSAGES=");
 
       argv[argc++] = "gpg";
       argv[argc++] = "--batch";