diff options
Diffstat (limited to 'net/samba3/files')
| -rw-r--r-- | net/samba3/files/patch-configure.in | 33 | ||||
| -rw-r--r-- | net/samba3/files/patch-include_config.h.in | 12 | ||||
| -rw-r--r-- | net/samba3/files/patch-include_includes.h | 17 | ||||
| -rw-r--r-- | net/samba3/files/patch-lib_util_str.c | 10 | ||||
| -rw-r--r-- | net/samba3/files/patch-script_installswat.sh | 23 |
5 files changed, 62 insertions, 33 deletions
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in index 1b8afc674007..0c42138e7b91 100644 --- a/net/samba3/files/patch-configure.in +++ b/net/samba3/files/patch-configure.in @@ -1,6 +1,17 @@ ---- configure.in.orig Fri Aug 6 23:38:21 2004 -+++ configure.in Wed Sep 1 03:03:48 2004 -@@ -810,6 +810,13 @@ +--- configure.in.orig Tue Nov 16 04:03:30 2004 ++++ configure.in Fri Nov 26 02:04:59 2004 +@@ -691,7 +691,9 @@ + AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h) + AC_CHECK_HEADERS(stropts.h poll.h) + AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h) +-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/cdefs.h glob.h) ++AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h) ++AC_CHECK_HEADERS(sys/cdefs.h glob.h) ++ + # These faile to compile on Solaris so just check for their presence + AC_CHECK_HEADERS(security/pam_modules.h net/if.h netinet/ip.h, [], [], -) + +@@ -829,6 +831,13 @@ AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type]) fi @@ -14,7 +25,19 @@ # stupid headers have the functions but no declaration. grrrr. AC_HAVE_DECL(errno, [#include <errno.h>]) AC_HAVE_DECL(setresuid, [#include <unistd.h>]) -@@ -3870,7 +3877,7 @@ +@@ -1125,6 +1134,11 @@ + AC_CHECK_FUNCS(setxattr lsetxattr fsetxattr) + AC_CHECK_FUNCS(attr_get attr_list attr_set attr_remove) + AC_CHECK_FUNCS(attr_getf attr_listf attr_setf attr_removef) ++# Check if we have extattr ++AC_CHECK_FUNCS(extattr_delete_fd extattr_delete_file extattr_delete_link) ++AC_CHECK_FUNCS(extattr_get_fd extattr_get_file extattr_get_link) ++AC_CHECK_FUNCS(extattr_list_fd extattr_list_file extattr_list_link) ++AC_CHECK_FUNCS(extattr_set_fd extattr_set_file extattr_set_link) + + # Assume non-shared by default and override below + BLDSHARED="false" +@@ -3939,7 +3953,7 @@ AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available]) ACL_LIBS="$ACL_LIBS -lpacl" ;; @@ -23,7 +46,7 @@ AC_MSG_RESULT(Using FreeBSD posix ACLs) AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available]) AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available]) -@@ -4189,7 +4196,7 @@ +@@ -4258,7 +4272,7 @@ *linux*) WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" ;; diff --git a/net/samba3/files/patch-include_config.h.in b/net/samba3/files/patch-include_config.h.in deleted file mode 100644 index 093b2ef23485..000000000000 --- a/net/samba3/files/patch-include_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- include/config.h.in.orig Sat May 8 02:33:46 2004 -+++ include/config.h.in Thu May 20 14:17:44 2004 -@@ -236,6 +236,9 @@ - /* Define to 1 if you have the `endnetgrent' function. */ - #undef HAVE_ENDNETGRENT - -+/* Whether optreset is available */ -+#undef HAVE_OPTRESET -+ - /* Whether errno() is available */ - #undef HAVE_ERRNO_DECL - diff --git a/net/samba3/files/patch-include_includes.h b/net/samba3/files/patch-include_includes.h new file mode 100644 index 000000000000..0260c58a5b85 --- /dev/null +++ b/net/samba3/files/patch-include_includes.h @@ -0,0 +1,17 @@ +--- include/includes.h.orig Fri Nov 26 00:47:28 2004 ++++ include/includes.h Fri Nov 26 01:59:16 2004 +@@ -476,6 +476,14 @@ + #include <sys/xattr.h> + #endif + ++#ifdef HAVE_SYS_EXTATTR_H ++#include <sys/extattr.h> ++#endif ++ ++#ifdef HAVE_SYS_UIO_H ++#include <sys/uio.h> ++#endif ++ + #if HAVE_LOCALE_H + #include <locale.h> + #endif diff --git a/net/samba3/files/patch-lib_util_str.c b/net/samba3/files/patch-lib_util_str.c index f5450d387648..9ade987532f2 100644 --- a/net/samba3/files/patch-lib_util_str.c +++ b/net/samba3/files/patch-lib_util_str.c @@ -1,13 +1,13 @@ ---- lib/util_str.c.orig Tue Apr 20 22:42:55 2004 -+++ lib/util_str.c Fri May 14 02:02:30 2004 -@@ -1980,10 +1980,16 @@ +--- lib/util_str.c.orig Wed Dec 15 15:33:12 2004 ++++ lib/util_str.c Fri Dec 17 02:15:34 2004 +@@ -2008,10 +2008,16 @@ { int bits = 0; int char_count = 0; - size_t out_cnt = 0; - size_t len = data.length; - size_t output_len = data.length * 2; -- char *result = malloc(output_len); /* get us plenty of space */ +- char *result = SMB_MALLOC(output_len); /* get us plenty of space */ + size_t out_cnt, len, output_len; + char *result; + @@ -17,7 +17,7 @@ + out_cnt = 0; + len = data.length; + output_len = data.length * 2; -+ result = malloc(output_len); /* get us plenty of space */ ++ result = SMB_MALLOC(output_len); /* get us plenty of space */ while (len-- && out_cnt < (data.length * 2) - 5) { int c = (unsigned char) *(data.data++); diff --git a/net/samba3/files/patch-script_installswat.sh b/net/samba3/files/patch-script_installswat.sh index ee4f20bbcd37..9cbea9ebc612 100644 --- a/net/samba3/files/patch-script_installswat.sh +++ b/net/samba3/files/patch-script_installswat.sh @@ -1,11 +1,12 @@ ---- script/installswat.sh.orig Fri Nov 19 21:11:15 2004 -+++ script/installswat.sh Fri Nov 19 21:11:45 2004 -@@ -103,7 +103,7 @@ - fi - fi - for f in $SRCDIR../docs/$dir/images/*.png; do -- FNAME=$INSTALLDIR/`basename $f` -+ FNAME=$INSTALLDIR/images/`basename $f` - echo $FNAME - cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? - chmod 0644 $FNAME +--- script/installswat.sh.orig Fri Dec 17 03:59:34 2004 ++++ script/installswat.sh Fri Dec 17 04:01:34 2004 +@@ -8,8 +8,7 @@ + echo Installing SWAT in $SWATDIR + echo Installing the Samba Web Administration Tool + +-LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`" +-echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` ++LANGS="." + + for ln in $LANGS; do + SWATLANGDIR=$SWATDIR/$ln |