[patch] files

mod_ntlm2-0.1-gentoo.patch (text/plain), 3.44 KB, created by Oleg Blednov on 2008-11-12 06:47:47 UTC

diff -ur mod_ntlm2-0.1.orig/Makefile mod_ntlm2-0.1/Makefile
--- mod_ntlm2-0.1.orig/Makefile	2003-02-25 14:25:42.000000000 +0300
+++ mod_ntlm2-0.1/Makefile	2008-11-11 17:55:49.000000000 +0300
@@ -6,7 +6,7 @@
 
 #   the used tools
 APXS=apxs
-APACHECTL=/etc/rc.d/apache
+APACHECTL=/etc/init.d/apache2
 
 #   the default target
 all: mod_ntlm.so
@@ -17,7 +17,7 @@
 
 #   install the shared object file into Apache 
 install: all
-	$(APXS) -i -a -n 'ntlm' mod_ntlm.so
+	$(APXS) -i -a -n 'ntlm' .libs/mod_ntlm.so
 
 #   cleanup
 clean:
diff -ur mod_ntlm2-0.1.orig/mod_ntlm.c mod_ntlm2-0.1/mod_ntlm.c
--- mod_ntlm2-0.1.orig/mod_ntlm.c	2003-02-23 18:58:02.000000000 +0300
+++ mod_ntlm2-0.1/mod_ntlm.c	2008-11-11 17:55:49.000000000 +0300
@@ -587,7 +587,7 @@
         return NULL;
     }
 
-    apr_pool_sub_make(&sp,p,NULL);
+    apr_pool_create_ex(&sp,p,NULL,NULL);
 
     while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
         if ((l[0] == '#') || (!l[0]))
diff -ur mod_ntlm2-0.1.orig/smbval/rfcnb-util.inc.c mod_ntlm2-0.1/smbval/rfcnb-util.inc.c
--- mod_ntlm2-0.1.orig/smbval/rfcnb-util.inc.c	2003-02-21 04:55:14.000000000 +0300
+++ mod_ntlm2-0.1/smbval/rfcnb-util.inc.c	2008-11-11 17:55:49.000000000 +0300
@@ -21,7 +21,7 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "std-includes.h"
 #include "rfcnb-priv.h"
diff -ur mod_ntlm2-0.1.orig/smbval/session.inc.c mod_ntlm2-0.1/smbval/session.inc.c
--- mod_ntlm2-0.1.orig/smbval/session.inc.c	2003-02-21 04:55:14.000000000 +0300
+++ mod_ntlm2-0.1/smbval/session.inc.c	2008-11-11 17:55:49.000000000 +0300
@@ -21,7 +21,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 static int RFCNB_errno = 0;
diff -ur mod_ntlm2-0.1.orig/smbval/smbencrypt.inc.c mod_ntlm2-0.1/smbval/smbencrypt.inc.c
--- mod_ntlm2-0.1.orig/smbval/smbencrypt.inc.c	2003-02-21 04:55:14.000000000 +0300
+++ mod_ntlm2-0.1/smbval/smbencrypt.inc.c	2008-11-11 17:55:49.000000000 +0300
@@ -19,7 +19,8 @@
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <string.h>
-#include <sys/vfs.h>
+#include <sys/param.h>
+#include <sys/mount.h>
 #include <netinet/in.h>
 
 #include "smblib-priv.h"
diff -ur mod_ntlm2-0.1.orig/smbval/smblib.inc.c mod_ntlm2-0.1/smbval/smblib.inc.c
--- mod_ntlm2-0.1.orig/smbval/smblib.inc.c	2003-02-21 04:55:14.000000000 +0300
+++ mod_ntlm2-0.1/smbval/smblib.inc.c	2008-11-11 17:55:49.000000000 +0300
@@ -20,10 +20,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc., 
  * 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 
-static int SMBlib_errno;
-static int SMBlib_SMB_Error;
+int SMBlib_errno;
+int SMBlib_SMB_Error;
 #define SMBLIB_ERRNO
 #define uchar unsigned char
 #include "smblib-priv.h"
@@ -32,7 +32,7 @@
 
 #include <signal.h>
 
-static SMB_State_Types SMBlib_State;
+SMB_State_Types SMBlib_State;
 
 /* Initialize the SMBlib package     */
 static int 
diff -ur mod_ntlm2-0.1.orig/smbval/smblib-util.inc.c mod_ntlm2-0.1/smbval/smblib-util.inc.c
--- mod_ntlm2-0.1.orig/smbval/smblib-util.inc.c	2003-02-21 04:55:14.000000000 +0300
+++ mod_ntlm2-0.1/smbval/smblib-util.inc.c	2008-11-11 17:55:49.000000000 +0300
@@ -21,7 +21,7 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "smblib-priv.h"
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "rfcnb.h"