- applied in 3.0.21b

Changed files:
    samba-3401.patch -> 1.2
    samba-setup-python.patch -> 1.5

diff --git a/samba-3401.patch b/samba-3401.patch
deleted file mode 100644 (file)
index c851a1b..0000000
--- a/samba-3401.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- samba-3.0.21a/source/libsmb/ntlmssp.c.old  2005-10-18 04:45:00.000000000 +0200
-+++ samba-3.0.21a/source/libsmb/ntlmssp.c      2006-01-22 13:18:02.000000000 +0100
-@@ -384,6 +384,11 @@
- 
- void ntlmssp_weaken_keys(NTLMSSP_STATE *ntlmssp_state)
- {
-+      /* Nothing to weaken.  We certainly don't want to 'extend' the length... */
-+      if (ntlmssp_state->session_key.length < 8) {
-+              return;
-+      }
-+
-       /* Key weakening not performed on the master key for NTLM2
-          and does not occour for NTLM1.  Therefore we only need
-          to do this for the LM_KEY.

diff --git a/samba-setup-python.patch b/samba-setup-python.patch
deleted file mode 100644 (file)
index 5bb15ff..0000000
--- a/samba-setup-python.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- samba-3.0.21/source/python/setup.py.orig   2005-12-25 20:27:49.884427000 +0100
-+++ samba-3.0.21/source/python/setup.py        2005-12-25 20:32:21.984427000 +0100
-@@ -63,8 +63,10 @@
-         next_is_flag = 0;
-     elif lib == "-Wl,-rpath":
-         next_is_path = 1;
--    elif lib[0:2] in ("-l","-pthread"):
-+    elif lib[0:2] == "-l":
-         libraries.append(lib[2:])
-+    elif lib[0:8] == "-pthread":
-+      libraries.append(lib[1:])
-     elif lib[0:2] == "-L":
-         library_dirs.append(lib[2:])
-     elif lib[0:2] in ("-W","-s"):