info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

some patches for cvs


From: Hubert Feyrer
Subject: some patches for cvs
Date: Thu, 19 Oct 2000 04:17:54 +0200 (MET DST)

It seems i'm not allowed to post to the CVS developers list. 
Someone please forward or pick it up otherwise. Let me know if you need
something.


 - Hubert

-- 
Hubert Feyrer <address@hidden>

---------- Forwarded message ----------
Date: Thu, 19 Oct 2000 03:00:42 +0200 (MEST)
From: address@hidden
To: address@hidden
Cc: address@hidden
Subject: some patches


Attached below you'll find some patches that are part of the NetBSD
Packages Collection for some time now, please include as much of them in
your next release as you can. They're based on cvs 1.11.

Changes:
 * -u switch to turn off locking completely. Use for anoncvs mirrors, as
   it's more effective as LockDir. Also, it was originally
   written for use in cases where the repository is also used for write
   access by other people (e.g. the MIT Kerberos repository in AFS), and
   thus you can't control the `LockDir' directive, and won't necessarily
   have permissions to write to the lock hierarchy.  It's forwarded
   through remote CVS, so it can be set by a client.
 * Allow setting of LOCALID, to get $NetBSD$, $KAME$ etc. as an alias to
   $Id$.
 * some changes to umask handling (patch-af_
 * RUN_UNSETXID flag to undo setxid in child processes, and some
   other changes around setxid.  (patch-ar)
 * new char %t that expands tag in CVSROOT/loginfo file (patch-at)
 * when re-adding file, use NONE as revision number, , not previous dead
   revision
 * Fix info files to make install-info work. 

Sorry there are no patches that document the -u switch and the %t 
modifier. 

Thanks for your great tool!


 - Hubert





$NetBSD: patch-aa,v 1.4 2000/10/18 03:31:15 hubertf Exp $

--- Makefile.in.orig    Fri Sep  8 20:28:02 2000
+++ Makefile.in
@@ -94,7 +94,7 @@
 
 ### Subdirectories to run make in for the primary targets.
 # Unix source subdirs, where we'll want to run lint and etags:
-USOURCE_SUBDIRS = lib zlib diff src
+USOURCE_SUBDIRS = lib diff src
 # All other subdirs:
 SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
        windows-NT os2 emx vms
@@ -187,21 +187,18 @@
 .PHONY: check
 check:
        cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-       cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
        cd diff ; $(MAKE) $(FLAGS_TO_PASS)
        cd src ; $(MAKE) $(FLAGS_TO_PASS) check
 
 .PHONY: remotecheck
 remotecheck:
        cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-       cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
        cd diff ; $(MAKE) $(FLAGS_TO_PASS)
        cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
 
 .PHONY: installcheck
 installcheck:
        cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-       cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
        cd diff ; $(MAKE) $(FLAGS_TO_PASS)
        cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
 
$NetBSD: patch-ab,v 1.4 2000/10/18 03:31:16 hubertf Exp $

--- doc/cvs.texinfo.orig        Wed Aug 30 03:16:32 2000
+++ doc/cvs.texinfo
@@ -40,6 +40,10 @@
 @setfilename cvs.info
 @include CVSvn.texi
 @settitle CVS---Concurrent Versions System
address@hidden Programming & development tools
address@hidden
+* CVS: (cvs)                   CVS Reference Manual.
address@hidden direntry
 @setchapternewpage odd
 
 @c -- TODO list:
$NetBSD: patch-ac,v 1.4 2000/10/18 03:31:16 hubertf Exp $

--- src/Makefile.in.orig        Fri Sep  8 20:28:03 2000
+++ src/Makefile.in
@@ -86,10 +86,8 @@
        @cd ..; $(MAKE) lint SUBDIRS=src
 
 install: installdirs
-       @for prog in $(PROGS); do \
-         echo Installing $$prog in $(bindir); \
-         $(INSTALL) $$prog $(bindir)/$$prog ; \
-       done
+       $(INSTALL_PROGRAM) cvs $(bindir)/
+       $(BSD_INSTALL_SCRIPT) cvsbug $(bindir)/
 
 installdirs:
        $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
@@ -140,10 +138,10 @@
 
 # Linking rules.
 
-$(PROGS): ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a
+$(PROGS): ../lib/libcvs.a ../diff/libdiff.a
 
 cvs: $(OBJECTS)
-       $(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a 
$(LIBS) $(LDFLAGS) -o $@ 
+       $(CC) $(OBJECTS) ../lib/libcvs.a -lz ../diff/libdiff.a $(LIBS) 
$(LDFLAGS) -o $@ 
 
 xlint: $(SOURCES)
        files= ; \
@@ -177,7 +175,7 @@
        $(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/diff $(DEFS) $(CFLAGS) -c 
$(srcdir)/rcscmds.c
 
 zlib.o: zlib.c $(top_srcdir)/zlib/zlib.h
-       $(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c 
$(srcdir)/zlib.c
+       $(CC) $(CPPFLAGS) $(INCLUDES) $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
 
 subdir = src
 Makefile: ../config.status Makefile.in
$NetBSD: patch-ad,v 1.5 2000/10/18 03:31:16 hubertf Exp $

--- contrib/Makefile.in.orig    Fri Sep  8 20:28:02 2000
+++ contrib/Makefile.in
@@ -37,7 +37,7 @@
 # Use cp if you don't have install.
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
 
 DISTFILES = \
        ChangeLog README .cvsignore intro.doc \
@@ -80,10 +80,10 @@
 
 install: all installdirs
        for f in $(CONTRIB_FILES) ; do\
-               $(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
+               $(INSTALL_DATA) $(srcdir)/$$f $(prefix)/share/cvs/contrib/$$f; \
        done
        for f in $(CONTRIB_PROGS) ; do\
-               $(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
+               $(INSTALL_PROGRAM) $$f $(prefix)/share/cvs/contrib/$$f; \
        done
        for f in $(PROGS) ; do\
                $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
@@ -91,7 +91,7 @@
 .PHONY: install
 
 installdirs:
-       $(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
+       $(top_srcdir)/mkinstalldirs $(prefix)/share/cvs/contrib
 .PHONY: installdirs
 
 tags:
$NetBSD: patch-ae,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/rcs.c.orig      Mon Aug 21 23:16:38 2000
+++ src/rcs.c
@@ -3361,6 +3361,9 @@
     { KEYWORD_INIT ("Revision") },
     { KEYWORD_INIT ("Source") },
     { KEYWORD_INIT ("State") },
+#ifdef LOCALID
+    { KEYWORD_INIT (LOCALID) },
+#endif
     { NULL, 0 }
 };
 enum keyword
@@ -3375,7 +3378,8 @@
     KEYWORD_RCSFILE,
     KEYWORD_REVISION,
     KEYWORD_SOURCE,
-    KEYWORD_STATE
+    KEYWORD_STATE,
+    KEYWORD_LOCALID
 };
 
 /* Convert an RCS date string into a readable string.  This is like
@@ -3603,6 +3607,7 @@
 
            case KEYWORD_HEADER:
            case KEYWORD_ID:
+           case KEYWORD_LOCALID:
                {
                    char *path;
                    int free_path;
$NetBSD: patch-af,v 1.3 2000/10/18 03:31:16 hubertf Exp $

--- src/update.c.orig   Wed Jul 26 21:29:01 2000
+++ src/update.c
@@ -1374,11 +1374,18 @@
                    xchmod (finfo->file, 1);
                else
                {
+                   mode_t oumask, writeaccess;
+
                    /* We know that we are the server here, so
                        although xchmod checks umask, we don't bother.  */
-                   mode |= (((mode & S_IRUSR) ? S_IWUSR : 0)
+                   /* Not bothering with the umask makes the files
+                      mode 0777 on old clients, though. -chb */
+                   oumask = umask(0);
+                   (void) umask(oumask);
+                   writeaccess = (((mode & S_IRUSR) ? S_IWUSR : 0)
                             | ((mode & S_IRGRP) ? S_IWGRP : 0)
                             | ((mode & S_IROTH) ? S_IWOTH : 0));
+                   mode |= (~oumask) & writeaccess;
                }
            }
 
$NetBSD: patch-ag,v 1.3 2000/10/18 03:31:16 hubertf Exp $

--- doc/cvsclient.texi.orig     Wed Aug 30 03:16:32 2000
+++ doc/cvsclient.texi
@@ -8,6 +8,11 @@
 * cvsclient: (cvsclient).      The CVS client/server protocol.
 @end direntry
 
address@hidden Programming & development tools
address@hidden
+* CVS-CLIENT: (cvsclient).     CVS client/server Reference Manual.
address@hidden direntry
+
 @node Top
 @top CVS Client/Server
 
$NetBSD: patch-ak,v 1.3 2000/10/18 03:31:16 hubertf Exp $

--- src/checkout.c.orig Wed Jun 28 06:15:47 2000
+++ src/checkout.c
@@ -179,7 +179,7 @@
            case 'p':
                pipeout = 1;
                run_module_prog = 0;    /* don't run module prog when piping */
-               noexec = 1;             /* so no locks will be created */
+               noexec = nolock = 1;    /* so no locks will be created */
                break;
            case 'c':
                cat = 1;
$NetBSD: patch-al,v 1.4 2000/10/18 03:31:16 hubertf Exp $

--- src/client.c.orig   Thu Jul  6 18:20:41 2000
+++ src/client.c
@@ -4455,6 +4455,16 @@
                error (1, 0,
                       "This server does not support the global -n option.");
        }
+       if (nolock && !noexec)
+       {
+           if (have_global)
+           {
+               send_to_server ("Global_option -u\012", 0);
+           }
+           else
+               error (1, 0,
+                      "This server does not support the global -u option.");
+       }
        if (quiet)
        {
            if (have_global)
$NetBSD: patch-am,v 1.4 2000/10/18 03:31:16 hubertf Exp $

--- src/cvs.h.orig      Sat Jul  8 21:57:21 2000
+++ src/cvs.h
@@ -394,6 +394,7 @@
 
 extern int trace;              /* Show all commands */
 extern int noexec;             /* Don't modify disk anywhere */
+extern int nolock;             /* Don't create locks */
 extern int logoff;             /* Don't write history entry */
 
 extern int top_level_admin;
@@ -654,6 +655,7 @@
 #define        RUN_STDOUT_APPEND       0x0004  /* append to stdout, don't 
truncate */
 #define        RUN_STDERR_APPEND       0x0008  /* append to stderr, don't 
truncate */
 #define        RUN_SIGIGNORE           0x0010  /* ignore interrupts for 
command */
+#define        RUN_UNSETXID            0x0020  /* undo setxid in child */
 #define        RUN_TTY         (char *)0       /* for the benefit of lint */
 
 void run_arg PROTO((const char *s));
$NetBSD: patch-an,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/history.c.orig  Wed May  3 00:13:25 2000
+++ src/history.c
@@ -730,7 +730,7 @@
     if (trace)
        fprintf (stderr, "%s-> fopen(%s,a)\n",
                 CLIENT_SERVER_STR, fname);
-    if (noexec)
+    if (nolock)
        goto out;
     fd = CVS_OPEN (fname, O_WRONLY | O_APPEND | O_CREAT | OPEN_BINARY, 0666);
     if (fd < 0)
$NetBSD: patch-ao,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/lock.c.orig     Thu Jul 27 18:49:27 2000
+++ src/lock.c
@@ -395,7 +395,7 @@
     FILE *fp;
     char *tmp;
 
-    if (noexec)
+    if (nolock)
        return (0);
 
     /* we only do one directory at a time for read locks! */
@@ -467,7 +467,7 @@
 {
     char *wait_repos;
 
-    if (noexec)
+    if (nolock)
        return (0);
 
     /* We only know how to do one list at a time */
$NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/main.c.orig     Thu Sep  7 01:35:04 2000
+++ src/main.c
@@ -41,6 +41,7 @@
 int quiet = 0;
 int trace = 0;
 int noexec = 0;
+int nolock = 0;
 int logoff = 0;
 
 /* Set if we should be writing CVSADM directories at top level.  At
@@ -239,6 +240,7 @@
     "    -w           Make checked-out files read-write (default).\n",
     "    -l           Turn history logging off.\n",
     "    -n           Do not execute anything that will change the disk.\n",
+    "    -u           Don't create locks (implies -l).\n",
     "    -t           Show trace of program execution -- try with -n.\n",
     "    -v           CVS version and copyright.\n",
     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
@@ -432,7 +434,7 @@
     int help = 0;              /* Has the user asked for help?  This
                                   lets us support the `cvs -H cmd'
                                   convention to give help for cmd. */
-    static const char short_options[] = "+Qqrwtnlvb:T:e:d:Hfz:s:xa";
+    static const char short_options[] = "+Qqrwtunlvb:T:e:d:Hfz:s:xa";
     static struct option long_options[] =
     {
         {"help", 0, NULL, 'H'},
@@ -562,6 +564,8 @@
                break;
            case 'n':
                noexec = 1;
+           case 'u':                   /* Fall through */
+               nolock = 1;
            case 'l':                   /* Fall through */
                logoff = 1;
                break;
@@ -936,7 +940,7 @@
                /*
                 * Check to see if the repository exists.
                 */
-               if (!client_active)
+               if (!client_active && !nolock)
                {
                    char *path;
                    int save_errno;
$NetBSD: patch-aq,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/recurse.c.orig  Thu Jun 22 00:28:37 2000
+++ src/recurse.c
@@ -508,7 +508,7 @@
     if (frame->flags == R_SKIP_ALL)
        return (0);
 
-    should_readlock = noexec ? 0 : frame->readlock;
+    should_readlock = nolock ? 0 : frame->readlock;
 
     /* The fact that locks are not active here is what makes us fail to have
        the
@@ -550,7 +550,7 @@
      */
     if (server_active
        /* If there are writelocks around, we cannot pause here.  */
-       && (should_readlock || noexec))
+       && (should_readlock || nolock))
        server_pause_check();
 #endif
 
$NetBSD: patch-ar,v 1.4 2000/10/18 03:31:16 hubertf Exp $

--- src/server.c.orig   Fri Jul 28 22:18:40 2000
+++ src/server.c
@@ -796,6 +796,7 @@
        nothing.  But for rsh, we need to do it now.  */
     parse_config (CVSroot_directory);
 
+    if (!nolock) {
     path = malloc (strlen (CVSroot_directory)
                   + sizeof (CVSROOTADM)
                   + 10);
@@ -813,6 +814,7 @@
        pending_error = save_errno;
     }
     free (path);
+    }
 
 #ifdef HAVE_PUTENV
     env = malloc (strlen (CVSROOT_ENV) + strlen (CVSroot_directory) + 1 + 1);
@@ -2194,6 +2196,8 @@
     {
        case 'n':
            noexec = 1;
+       case 'u':
+           nolock = 1;
            break;
        case 'q':
            quiet = 1;
@@ -5172,6 +5176,7 @@
     const char *username;
 {
     struct passwd *pw;
+    int rc;
 
     pw = getpwnam (username);
     if (pw == NULL)
@@ -5231,7 +5236,15 @@
        }
     }
     
-    if (setuid (pw->pw_uid) < 0)
+#ifdef SETXID_SUPPORT
+    /* Honor the setuid bit iff set. */
+    if (getuid() != geteuid())
+       rc = setuid (geteuid ());
+    else
+#else
+        rc = setuid (pw->pw_uid);
+#endif
+    if (rc < 0)
     {
        /* Note that this means that if run as a non-root user,
           CVSROOT/passwd must contain the user we are running as
$NetBSD: patch-as,v 1.2 2000/10/18 03:31:16 hubertf Exp $

--- src/tag.c.orig      Wed Jun 14 21:32:51 2000
+++ src/tag.c
@@ -868,7 +868,7 @@
        /* The tags is valid but not mentioned in val-tags.  Add it.  */
        datum value;
 
-       if (noexec)
+       if (nolock)
        {
            if (db != NULL)
                dbm_close (db);
$NetBSD: patch-at,v 1.4 2000/10/18 03:31:17 hubertf Exp $

--- src/logmsg.c.orig   Wed Mar  1 17:33:39 2000
+++ src/logmsg.c
@@ -283,7 +283,7 @@
     run_setup (editinfo_editor ? editinfo_editor : Editor);
     run_arg (fname);
     if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
-                            RUN_NORMAL | RUN_SIGIGNORE)) != 0)
+                            RUN_NORMAL | RUN_SIGIGNORE | RUN_UNSETXID)) != 0)
        error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
               editinfo_editor ? "Logfile verification failed" :
               "warning: editor session failed");
@@ -590,6 +590,15 @@
                        xrealloc (str_list,
                                  strlen (str_list) + strlen (p->key) + 5);
                    (void) strcat (str_list, p->key);
+                   break;
+               case 't':
+                   str_list =
+                       xrealloc (str_list,
+                                 (strlen (str_list)
+                                  + (li->tag ? strlen (li->tag) : 0)
+                                  + 10)
+                                 );
+                   (void) strcat (str_list, (li->tag ? li->tag : ""));
                    break;
                case 'V':
                    str_list =
$NetBSD: patch-au,v 1.3 2000/10/18 03:31:17 hubertf Exp $

--- src/commit.c.orig   Wed Jul 26 21:29:01 2000
+++ src/commit.c
@@ -996,7 +996,9 @@
                  xmalloc (sizeof (struct logfile_info)));
            li->type = status;
            li->tag = xstrdup (vers->tag);
-           li->rev_old = xstrdup (vers->vn_rcs);
+           /* If the file was re-added, we want the revision in the commitlog
+              to be NONE, not the previous dead revision. */
+           li->rev_old = status == T_ADDED ? NULL : xstrdup (vers->vn_rcs);
            li->rev_new = NULL;
            p->data = (char *) li;
            (void) addnode (ulist, p);
@@ -1497,7 +1499,7 @@
                run_print (stdout);
                cvs_output ("'\n", 0);
                cvs_flushout ();
-               (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
+               (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL | 
RUN_UNSETXID);
                free (repos);
            }
            else
$NetBSD: patch-av,v 1.4 2000/10/18 03:31:17 hubertf Exp $

--- configure.in.orig   Tue Aug  1 18:13:25 2000
+++ configure.in
@@ -110,16 +110,19 @@
 dnl libkrb in the system libraries, so --with-krb4=value needs to
 dnl override the system -lkrb.
 dnl
-KRB4=/usr/kerberos
+KRB4=
 define(WITH_KRB4,[
 AC_ARG_WITH([krb4],
   [  --with-krb4=value       set default \$(KRB4) from value],
-  [KRB4=$withval],
+  [if test X"$withval" != X"no"; then KRB4=$withval; fi],
 )dnl
-echo "default place for krb4 is $KRB4"
+if test X"$KRB4" != X""; then
+    echo "default place for krb4 is $KRB4"
+fi
 AC_SUBST(KRB4)])dnl
 WITH_KRB4
 
+if test X"$KRB4" != X""; then
 krb_h=
 AC_MSG_CHECKING([for krb.h])
 if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
@@ -181,20 +184,27 @@
   fi
 fi
 AC_CHECK_FUNCS(krb_get_err_text)
+fi     # KRB4 empty
+
+includeopt=
+AC_SUBST(includeopt)
 
 dnl
 dnl Use --with-gssapi=DIR to enable GSSAPI support.
 dnl
-GSSAPI=/usr/cygnus/kerbnet
+GSSAPI=
 define(WITH_GSSAPI,[
 AC_ARG_WITH([gssapi],
   [  --with-gssapi=value     GSSAPI directory],
-  [GSSAPI=$withval],
+  [if test X"$withval" != X"no"; then GSSAPI=$withval; fi],
 )dnl
-echo "default place for GSSAPI is $GSSAPI"
+if test X"$GSSAPI" != X""; then
+    echo "default place for GSSAPI is $GSSAPI"
+fi
 AC_SUBST(GSSAPI)])dnl
 WITH_GSSAPI
 
+if test X"$GSSAPI" != X""; then
 hold_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
 AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
@@ -223,6 +233,7 @@
   # there, an_to_ln.o refers to things defined only in -lgen.
   AC_CHECK_LIB(gen, compile)
 fi
+fi     # GSSAPI empty
 
 dnl
 dnl Use --with-encryption to turn on encryption support
--- configure.orig      Wed Oct 18 04:35:53 2000
+++ configure   Wed Oct 18 04:36:01 2000
@@ -2820,19 +2820,22 @@
   
 fi
 
-KRB4=/usr/kerberos
+KRB4=
 
 # Check whether --with-krb4 or --without-krb4 was given.
 if test "${with_krb4+set}" = set; then
   withval="$with_krb4"
-  KRB4=$withval
+  if test X"$withval" != X"no"; then KRB4=$withval; fi
+fi
+if test X"$KRB4" != X""; then
+    echo "default place for krb4 is $KRB4"
 fi
-echo "default place for krb4 is $KRB4"
 
 
+if test X"$KRB4" != X""; then
 krb_h=
 echo $ac_n "checking for krb.h""... $ac_c" 1>&6
-echo "configure:2836: checking for krb.h" >&5
+echo "configure:2839: checking for krb.h" >&5
 if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
    hold_cflags=$CFLAGS
    CFLAGS="$CFLAGS -I$KRB4/include"
@@ -3177,17 +3180,24 @@
 fi
 done
 
+fi     # KRB4 empty
+
+includeopt=
 
-GSSAPI=/usr/cygnus/kerbnet
+
+GSSAPI=
 
 # Check whether --with-gssapi or --without-gssapi was given.
 if test "${with_gssapi+set}" = set; then
   withval="$with_gssapi"
-  GSSAPI=$withval
+  if test X"$withval" != X"no"; then GSSAPI=$withval; fi
+fi
+if test X"$GSSAPI" != X""; then
+    echo "default place for GSSAPI is $GSSAPI"
 fi
-echo "default place for GSSAPI is $GSSAPI"
 
 
+if test X"$GSSAPI" != X""; then
 hold_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
 for ac_hdr in krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
@@ -3332,6 +3342,7 @@
 fi
 
 fi
+fi     # GSSAPI empty
 
 # Check whether --enable-encryption or --disable-encryption was given.
 if test "${enable_encryption+set}" = set; then
$NetBSD: patch-ax,v 1.3 2000/10/18 03:31:17 hubertf Exp $

--- diff/Makefile.in.orig       Thu May  6 18:32:55 1999
+++ diff/Makefile.in
@@ -31,7 +31,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-PR_PROGRAM = /bin/pr
+PR_PROGRAM = /usr/bin/pr
 
 #### End of system configuration section. ####
 
$NetBSD: patch-ay,v 1.2 2000/02/23 06:48:56 mycroft Exp $

--- src/run.c.orig      Thu Dec 18 10:18:50 1997
+++ src/run.c   Wed Feb 23 01:19:27 2000
@@ -188,6 +188,13 @@
 #endif
     if (pid == 0)
     {
+#ifdef SETXID_SUPPORT
+       if (flags & RUN_UNSETXID) {
+           (void) setgid (getgid ());
+           (void) setuid (getuid ());
+       }
+#endif
+
        if (shin != 0)
        {
            (void) dup2 (shin, 0);
$NetBSD: patch-az,v 1.2 2000/10/18 03:31:17 hubertf Exp $

--- src/modules.c.orig  Wed Jul 26 21:29:01 2000
+++ src/modules.c
@@ -740,7 +740,8 @@
                    cvs_output ("'\n", 0);
                    cvs_flushout ();
                }
-               err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
+               err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
+                                RUN_NORMAL | RUN_UNSETXID);
                free (expanded_path);
            }
            free (real_prog);

-- 
NetBSD - because Unix isn't just #include <linux.h>, i386, ILP32, ELF, ...!




reply via email to

[Prev in Thread] Current Thread [Next in Thread]