diff options
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 16 | ||||
| -rw-r--r-- | net/samba/patches/patch-aa | 6 | ||||
| -rw-r--r-- | net/samba/patches/patch-ab | 14 | ||||
| -rw-r--r-- | net/samba/patches/patch-ac | 97 | ||||
| -rw-r--r-- | net/samba/patches/patch-ad | 126 | ||||
| -rw-r--r-- | net/samba/patches/patch-ae | 86 | ||||
| -rw-r--r-- | net/samba/patches/patch-af | 35 |
8 files changed, 192 insertions, 192 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index d111d34eca6..3a58dc0842a 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.47 2001/04/18 12:54:47 tron Exp $ +# $NetBSD: Makefile,v 1.48 2001/05/10 09:00:23 abs Exp $ -DISTNAME= samba-2.0.8 +DISTNAME= samba-2.0.9 WRKSRC= ${WRKDIR}/${DISTNAME}/source CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ diff --git a/net/samba/distinfo b/net/samba/distinfo index c2adebf766d..d36e9a78264 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2001/04/21 11:23:32 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/05/10 09:00:23 abs Exp $ -SHA1 (samba-2.0.8.tar.gz) = f4bcfbc4e357abea9dd76f64cb6446a458024158 -Size (samba-2.0.8.tar.gz) = 3489579 bytes -SHA1 (patch-aa) = 3639b63dbad9a36f384d20e1e41c2284a1a0b2ad -SHA1 (patch-ac) = b7c77f8658732066f7465b9a3b1703d480d1bdde -SHA1 (patch-ad) = 04f0d600ad8c43e75edd6dcb91db5993731edd30 -SHA1 (patch-ae) = 2484733df1d605a8e45db6c8a7ad8deb6b5b1b65 -SHA1 (patch-af) = 5edefa227b74fc8cb70e795c81e9648711df450c +SHA1 (samba-2.0.9.tar.gz) = 8f0e6b1e6adca36d055d243c8062eb641a42ff38 +Size (samba-2.0.9.tar.gz) = 3495816 bytes +SHA1 (patch-aa) = 56b1bc048347bb15bf0b9dffe0f3848eac875357 +SHA1 (patch-ab) = f81ae4b2f954804f0e297fea30e49dbe52a452e8 +SHA1 (patch-ac) = 0ba35774d41978563c795fafffb6fafc87d94c0e +SHA1 (patch-ad) = be7fc7ec26cf741f2d52bde173df71999177fd8a +SHA1 (patch-ae) = 1ad0547af3efeae925b8e385ff7a21137367ce19 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index c2cbc5b9d4b..6578926fef8 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.12 2001/04/18 12:54:47 tron Exp $ +$NetBSD: patch-aa,v 1.13 2001/05/10 09:00:23 abs Exp $ ---- Makefile.in.orig Thu Mar 16 23:57:08 2000 -+++ Makefile.in Wed Apr 18 14:29:22 2001 +--- Makefile.in.orig Thu Mar 16 22:57:08 2000 ++++ Makefile.in @@ -25,10 +25,12 @@ BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab new file mode 100644 index 00000000000..cdeda5eb447 --- /dev/null +++ b/net/samba/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.9 2001/05/10 09:00:23 abs Exp $ + +--- acconfig.h.orig Wed Apr 18 00:00:52 2001 ++++ acconfig.h +@@ -79,7 +79,9 @@ + #undef SIZEOF_INO_T + #undef SIZEOF_OFF_T + #undef STAT_STATVFS64 ++#undef HAVE_READLINE + #undef HAVE_LIBREADLINE ++#undef HAVE_LIBEDIT + #undef HAVE_KERNEL_OPLOCKS + #undef HAVE_IRIX_SPECIFIC_CAPABILITIES + #undef HAVE_INT16_FROM_RPC_RPC_H diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac index 104548bcc54..79f3def3717 100644 --- a/net/samba/patches/patch-ac +++ b/net/samba/patches/patch-ac @@ -1,14 +1,85 @@ -$NetBSD: patch-ac,v 1.5 2000/09/03 09:17:00 kei Exp $ +$NetBSD: patch-ac,v 1.6 2001/05/10 09:00:24 abs Exp $ ---- acconfig.h.orig Tue Jul 11 02:37:45 2000 -+++ acconfig.h Sun Sep 3 06:23:07 2000 -@@ -80,7 +80,9 @@ - #undef SIZEOF_INO_T - #undef SIZEOF_OFF_T - #undef STAT_STATVFS64 -+#undef HAVE_READLINE - #undef HAVE_LIBREADLINE -+#undef HAVE_LIBEDIT - #undef HAVE_KERNEL_OPLOCKS - #undef HAVE_IRIX_SPECIFIC_CAPABILITIES - #undef HAVE_INT16_FROM_RPC_RPC_H +--- client/client.c.orig Wed Apr 18 00:00:52 2001 ++++ client/client.c +@@ -1180,7 +1180,7 @@ + "find . -name \"%s\" -print > %s",p,tmpname); + else + slprintf(cmd,sizeof(pstring)-1, +- "find . -maxdepth 1 -name \"%s\" -print > %s",p,tmpname); ++ "ls -1 %s > %s",p,tmpname); + system(cmd); + close(fd); + +@@ -1615,22 +1615,19 @@ + return True; + } + +-#if defined(HAVE_LIBREADLINE) ++#if defined(HAVE_READLINE) + # if defined(HAVE_READLINE_HISTORY_H) || defined(HAVE_HISTORY_H) + /**************************************************************************** + history + ****************************************************************************/ + static void cmd_history(void) + { +- HIST_ENTRY **hlist; + register int i; + +- hlist = history_list (); /* Get pointer to history list */ +- +- if (hlist) /* If list not empty */ ++ if (history_length) /* If history is not empty */ + { +- for (i = 0; hlist[i]; i++) /* then display it */ +- DEBUG(0, ("%d: %s\n", i, hlist[i]->line)); ++ for (i = 1; i <= history_length; i++) /* then display it */ ++ DEBUG(0, ("%d: %s\n", i, history_get(i)->line)); + } + } + # endif +@@ -1691,7 +1688,7 @@ + {"setmode",cmd_setmode,"filename <setmode string> change modes of file",{COMPL_REMOTE,COMPL_NONE}}, + {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}}, + {"?",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}}, +-#ifdef HAVE_LIBREADLINE ++#ifdef HAVE_READLINE + {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}}, + #endif + {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}}, +@@ -1751,7 +1748,7 @@ + } + } + +-#ifndef HAVE_LIBREADLINE ++#ifndef HAVE_READLINE + /**************************************************************************** + wait for keyboard activity, swallowing network packets + ****************************************************************************/ +@@ -1830,7 +1827,7 @@ + pstring line; + char *ptr; + +-#ifdef HAVE_LIBREADLINE ++#ifdef HAVE_READLINE + /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */ + #ifdef PROMPTSIZE + #undef PROMPTSIZE +@@ -1844,7 +1841,7 @@ + while (!feof(stdin)) { + fstring tok; + int i; +-#ifdef HAVE_LIBREADLINE ++#ifdef HAVE_READLINE + if ( temp != (char *)NULL ) + { + free( temp ); /* Free memory allocated every time by readline() */ +@@ -2231,7 +2228,7 @@ + + DEBUGLEVEL = 2; + +-#ifdef HAVE_LIBREADLINE ++#ifdef HAVE_READLINE + /* Allow conditional parsing of the ~/.inputrc file. */ + rl_readline_name = "smbclient"; + #endif diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad index cbb3869aec1..af60a89a42b 100644 --- a/net/samba/patches/patch-ad +++ b/net/samba/patches/patch-ad @@ -1,85 +1,55 @@ -$NetBSD: patch-ad,v 1.4 2001/04/18 12:54:47 tron Exp $ +$NetBSD: patch-ad,v 1.5 2001/05/10 09:00:24 abs Exp $ ---- client/client.c.orig Wed Apr 18 01:00:52 2001 -+++ client/client.c Wed Apr 18 14:32:09 2001 -@@ -1180,7 +1180,7 @@ - "find . -name \"%s\" -print > %s",p,tmpname); - else - slprintf(cmd,sizeof(pstring)-1, -- "find . -maxdepth 1 -name \"%s\" -print > %s",p,tmpname); -+ "ls -1 %s > %s",p,tmpname); - system(cmd); - close(fd); +--- configure.in.orig Wed Apr 18 00:00:52 2001 ++++ configure.in +@@ -234,9 +234,6 @@ + AC_CHECK_TYPE(offset_t,loff_t) + AC_CHECK_TYPE(ssize_t, int) -@@ -1615,22 +1615,19 @@ - return True; - } +-# we need libcups for CUPS support... +-AC_CHECK_LIB(cups,httpConnect) +- + # we need libdl for PAM and the new VFS code + AC_CHECK_LIB(dl,main) --#if defined(HAVE_LIBREADLINE) -+#if defined(HAVE_READLINE) - # if defined(HAVE_READLINE_HISTORY_H) || defined(HAVE_HISTORY_H) - /**************************************************************************** - history - ****************************************************************************/ - static void cmd_history(void) - { -- HIST_ENTRY **hlist; - register int i; +@@ -312,7 +309,14 @@ + # test for where we get readline() from + if test "$ac_cv_header_readline_h" = "yes" || + test "$ac_cv_header_readline_readline_h" = "yes"; then +- AC_CHECK_LIB(readline,readline) ++ AC_CHECK_LIB(termcap, tputs) ++ if test "$ac_cv_lib_termcap_tputs" = "yes"; then ++ AC_CHECK_LIB(edit, readline, , [AC_CHECK_LIB(readline, readline)]) ++ if test "$ac_cv_lib_edit_readline" = "yes" || ++ test "$ac_cv_lib_readline_readline" = "yes"; then ++ AC_DEFINE(HAVE_READLINE) ++ fi ++ fi + fi -- hlist = history_list (); /* Get pointer to history list */ -- -- if (hlist) /* If list not empty */ -+ if (history_length) /* If history is not empty */ - { -- for (i = 0; hlist[i]; i++) /* then display it */ -- DEBUG(0, ("%d: %s\n", i, hlist[i]->line)); -+ for (i = 1; i <= history_length; i++) /* then display it */ -+ DEBUG(0, ("%d: %s\n", i, history_get(i)->line)); - } - } - # endif -@@ -1691,7 +1688,7 @@ - {"setmode",cmd_setmode,"filename <setmode string> change modes of file",{COMPL_REMOTE,COMPL_NONE}}, - {"help",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}}, - {"?",cmd_help,"[command] give help on a command",{COMPL_NONE,COMPL_NONE}}, --#ifdef HAVE_LIBREADLINE -+#ifdef HAVE_READLINE - {"history",cmd_history,"displays the command history",{COMPL_NONE,COMPL_NONE}}, - #endif - {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}}, -@@ -1751,7 +1748,7 @@ - } - } --#ifndef HAVE_LIBREADLINE -+#ifndef HAVE_READLINE - /**************************************************************************** - wait for keyboard activity, swallowing network packets - ****************************************************************************/ -@@ -1830,7 +1827,7 @@ - pstring line; - char *ptr; +@@ -1160,6 +1164,24 @@ + AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES) + fi --#ifdef HAVE_LIBREADLINE -+#ifdef HAVE_READLINE - /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */ - #ifdef PROMPTSIZE - #undef PROMPTSIZE -@@ -1844,7 +1841,7 @@ - while (!feof(stdin)) { - fstring tok; - int i; --#ifdef HAVE_LIBREADLINE -+#ifdef HAVE_READLINE - if ( temp != (char *)NULL ) - { - free( temp ); /* Free memory allocated every time by readline() */ -@@ -2231,7 +2228,7 @@ ++ ++################################################# ++# check for CUPS support ++AC_MSG_CHECKING(whether to use CUPS) ++AC_ARG_WITH(cups, ++[ --with-cups Include CUPS support ++ --without-cups Don't include CUPS support (default)], ++[ case "$withval" in ++ yes) ++ AC_MSG_RESULT(yes) ++ AC_CHECK_LIB(cups, httpConnect) ++ ;; ++ *) ++ AC_MSG_RESULT(no) ++ ;; ++ esac ], ++ AC_MSG_RESULT(no) ++) - DEBUGLEVEL = 2; - --#ifdef HAVE_LIBREADLINE -+#ifdef HAVE_READLINE - /* Allow conditional parsing of the ~/.inputrc file. */ - rl_readline_name = "smbclient"; - #endif + ################################################# + # check for smbwrapper support diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae index 6d946001f70..748c1cba442 100644 --- a/net/samba/patches/patch-ae +++ b/net/samba/patches/patch-ae @@ -1,55 +1,35 @@ -$NetBSD: patch-ae,v 1.3 2000/09/03 09:17:00 kei Exp $ +$NetBSD: patch-ae,v 1.4 2001/05/10 09:00:24 abs Exp $ ---- configure.in.orig Tue Jul 11 02:37:45 2000 -+++ configure.in Sun Sep 3 06:23:09 2000 -@@ -237,9 +237,6 @@ - AC_CHECK_TYPE(offset_t,loff_t) - AC_CHECK_TYPE(ssize_t, int) +--- include/includes.h.orig Thu Mar 16 22:59:09 2000 ++++ include/includes.h +@@ -808,20 +808,20 @@ + #define ULTRIX_AUTH 1 + #endif --# we need libcups for CUPS support... --AC_CHECK_LIB(cups,httpConnect) -- - # we need libdl for PAM and the new VFS code - AC_CHECK_LIB(dl,main) - -@@ -315,7 +312,14 @@ - # test for where we get readline() from - if test "$ac_cv_header_readline_h" = "yes" || - test "$ac_cv_header_readline_readline_h" = "yes"; then -- AC_CHECK_LIB(readline,readline) -+ AC_CHECK_LIB(termcap, tputs) -+ if test "$ac_cv_lib_termcap_tputs" = "yes"; then -+ AC_CHECK_LIB(edit, readline, , [AC_CHECK_LIB(readline, readline)]) -+ if test "$ac_cv_lib_edit_readline" = "yes" || -+ test "$ac_cv_lib_readline_readline" = "yes"; then -+ AC_DEFINE(HAVE_READLINE) -+ fi -+ fi - fi - - -@@ -1227,6 +1231,24 @@ - AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES) - fi - -+ -+################################################# -+# check for CUPS support -+AC_MSG_CHECKING(whether to use CUPS) -+AC_ARG_WITH(cups, -+[ --with-cups Include CUPS support -+ --without-cups Don't include CUPS support (default)], -+[ case "$withval" in -+ yes) -+ AC_MSG_RESULT(yes) -+ AC_CHECK_LIB(cups, httpConnect) -+ ;; -+ *) -+ AC_MSG_RESULT(no) -+ ;; -+ esac ], -+ AC_MSG_RESULT(no) -+) - - ################################################# - # check for smbwrapper support +-#ifdef HAVE_LIBREADLINE +-# ifdef HAVE_READLINE_READLINE_H +-# include <readline/readline.h> +-# ifdef HAVE_READLINE_HISTORY_H +-# include <readline/history.h> ++#ifdef HAVE_READLINE ++# ifdef HAVE_READLINE_H ++# include <readline.h> ++# ifdef HAVE_HISTORY_H ++# include <history.h> + # endif + # else +-# ifdef HAVE_READLINE_H +-# include <readline.h> +-# ifdef HAVE_HISTORY_H +-# include <history.h> ++# ifdef HAVE_READLINE_READLINE_H ++# include <readline/readline.h> ++# ifdef HAVE_READLINE_HISTORY_H ++# include <readline/history.h> + # endif + # else +-# undef HAVE_LIBREADLINE ++# undef HAVE_READLINE + # endif + # endif + #endif diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af deleted file mode 100644 index bda5fdc5778..00000000000 --- a/net/samba/patches/patch-af +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-af,v 1.3 2000/09/03 09:17:00 kei Exp $ - ---- include/includes.h.orig Sat Jul 15 01:52:58 2000 -+++ include/includes.h Sun Sep 3 06:23:10 2000 -@@ -832,20 +832,20 @@ - #define ULTRIX_AUTH 1 - #endif - --#ifdef HAVE_LIBREADLINE --# ifdef HAVE_READLINE_READLINE_H --# include <readline/readline.h> --# ifdef HAVE_READLINE_HISTORY_H --# include <readline/history.h> -+#ifdef HAVE_READLINE -+# ifdef HAVE_READLINE_H -+# include <readline.h> -+# ifdef HAVE_HISTORY_H -+# include <history.h> - # endif - # else --# ifdef HAVE_READLINE_H --# include <readline.h> --# ifdef HAVE_HISTORY_H --# include <history.h> -+# ifdef HAVE_READLINE_READLINE_H -+# include <readline/readline.h> -+# ifdef HAVE_READLINE_HISTORY_H -+# include <readline/history.h> - # endif - # else --# undef HAVE_LIBREADLINE -+# undef HAVE_READLINE - # endif - # endif - #endif |