summaryrefslogtreecommitdiff
path: root/japanese/samba/patches
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/samba/patches')
-rw-r--r--japanese/samba/patches/patch-aa67
-rw-r--r--japanese/samba/patches/patch-ac14
-rw-r--r--japanese/samba/patches/patch-ad76
-rw-r--r--japanese/samba/patches/patch-ae55
-rw-r--r--japanese/samba/patches/patch-af35
5 files changed, 247 insertions, 0 deletions
diff --git a/japanese/samba/patches/patch-aa b/japanese/samba/patches/patch-aa
new file mode 100644
index 00000000000..7b9025a406d
--- /dev/null
+++ b/japanese/samba/patches/patch-aa
@@ -0,0 +1,67 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
+
+--- Makefile.in.orig Tue Apr 25 19:06:11 2000
++++ Makefile.in Fri Apr 28 16:26:52 2000
+@@ -25,10 +25,12 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
+ LIBDIR = @libdir@
+ VARDIR = @localstatedir@
+ MANDIR = @mandir@
++ETCDIR?= $(BASEDIR)/etc
++LOGDIR?= $(BASEDIR)/log
+ SAMBABOOK = @sambabook@
+
+ # The permissions to give the executables
+@@ -37,12 +39,12 @@
+ # set these to where to find various files
+ # These can be overridden by command line switches (see smbd(8))
+ # or in smb.conf (see smb.conf(5))
+-SMBLOGFILE = $(VARDIR)/log.smb
+-NMBLOGFILE = $(VARDIR)/log.nmb
+-CONFIGFILE = $(LIBDIR)/smb.conf
+-LMHOSTSFILE = $(LIBDIR)/lmhosts
+-DRIVERFILE = $(LIBDIR)/printers.def
+-PASSWD_PROGRAM = /bin/passwd
++SMBLOGFILE = $(LOGDIR)/log.smb
++NMBLOGFILE = $(LOGDIR)/log.nmb
++CONFIGFILE = $(ETCDIR)/smb.conf
++LMHOSTSFILE = $(ETCDIR)/lmhosts
++DRIVERFILE = $(ETCDIR)/printers.def
++PASSWD_PROGRAM = /usr/bin/passwd
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
+
+@@ -470,14 +472,14 @@
+
+ installdirs:
+ $(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
+- $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
++ $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
+
+ installservers: all installdirs
+- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
+
+ installbin: all installdirs
+- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+
+ installscripts: installdirs
+ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+@@ -495,8 +497,8 @@
+ @$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
+
+ uninstallbin:
+- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
++ @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
++ @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
+
+ uninstallscripts:
+ @$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
diff --git a/japanese/samba/patches/patch-ac b/japanese/samba/patches/patch-ac
new file mode 100644
index 00000000000..a46d093f46a
--- /dev/null
+++ b/japanese/samba/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
+
+--- acconfig.h.orig Tue Apr 25 19:06:11 2000
++++ acconfig.h Fri Apr 28 16:27:20 2000
+@@ -81,7 +81,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/japanese/samba/patches/patch-ad b/japanese/samba/patches/patch-ad
new file mode 100644
index 00000000000..f28f8880b4b
--- /dev/null
+++ b/japanese/samba/patches/patch-ad
@@ -0,0 +1,76 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
+
+--- client/client.c.orig Tue Apr 25 19:06:41 2000
++++ client/client.c Fri Apr 28 16:29:58 2000
+@@ -1598,22 +1598,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
+@@ -1675,7 +1672,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}},
+@@ -1735,7 +1732,7 @@
+ }
+ }
+
+-#ifndef HAVE_LIBREADLINE
++#ifndef HAVE_READLINE
+ /****************************************************************************
+ wait for keyboard activity, swallowing network packets
+ ****************************************************************************/
+@@ -1814,7 +1811,7 @@
+ pstring line;
+ char *ptr;
+
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+ /* Minimal readline support, 29Jun1999, s.xenitellis@rhbnc.ac.uk */
+ #ifdef PROMPTSIZE
+ #undef PROMPTSIZE
+@@ -1828,7 +1825,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() */
+@@ -2215,7 +2212,7 @@
+
+ DEBUGLEVEL = 2;
+
+-#ifdef HAVE_LIBREADLINE
++#ifdef HAVE_READLINE
+ /* Allow conditional parsing of the ~/.inputrc file. */
+ rl_readline_name = "smbclient";
+ #endif
diff --git a/japanese/samba/patches/patch-ae b/japanese/samba/patches/patch-ae
new file mode 100644
index 00000000000..3aa155c9419
--- /dev/null
+++ b/japanese/samba/patches/patch-ae
@@ -0,0 +1,55 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
+
+--- configure.in.orig Tue Apr 25 19:06:39 2000
++++ configure.in Fri Apr 28 16:33:54 2000
+@@ -234,9 +234,6 @@
+ AC_CHECK_TYPE(offset_t,loff_t)
+ AC_CHECK_TYPE(ssize_t, int)
+
+-# 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)
+
+@@ -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
+
+
+@@ -1138,6 +1142,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
diff --git a/japanese/samba/patches/patch-af b/japanese/samba/patches/patch-af
new file mode 100644
index 00000000000..dafc5693c39
--- /dev/null
+++ b/japanese/samba/patches/patch-af
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
+
+--- include/includes.h.orig Tue Apr 25 19:06:46 2000
++++ include/includes.h Fri Apr 28 16:34:56 2000
+@@ -808,20 +808,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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-12 01:04:02 +0000