Consolidate diffs to a single file into one patch and add a boatload

of patches to fix the build on -current.

1 files changed, 22 insertions, 0 deletions

diff --git a/misc/estic/files/patch-an b/misc/estic/files/patch-an
new file mode 100644
index 000000000000..77354ad3aaa9
--- /dev/null
+++ b/misc/estic/files/patch-an
@@ -0,0 +1,22 @@
+--- spunk/password.cc.orig	Sat Feb 26 17:59:02 2000
++++ spunk/password.cc	Sat Feb 26 18:01:24 2000
+@@ -525,14 +525,14 @@
+ 
+ 
+ 
+-static void EntryEditor (PasswordEntry* E, int& Abort, int& Changed)
++inline void EntryEditor (PasswordEntry* E, int& Abort, int& Changed)
+ // Allow editing of one password entry
+ {
+     // ID's of the menue items
+-    const miUserID      = 1;
+-    const miUserName    = 2;
+-    const miPassword    = 3;
+-    const miLevel       = 4;
++    const int miUserID      = 1;
++    const int miUserName    = 2;
++    const int miPassword    = 3;
++    const int miLevel       = 4;
+ 
+      // Remember the crc of the entry
+     u32 OldCRC = GetCRC (E);