Per discussion with the author, these changes were a bad idea.

6 files changed, 0 insertions, 471 deletions

diff --git a/net/rsync/patches/patch-aa b/net/rsync/patches/patch-aa
deleted file mode 100644
index 43d28ec2caf..00000000000
--- a/net/rsync/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1998/11/05 00:24:38 mycroft Exp $
-
---- receiver.c.orig	Tue Nov  3 17:00:46 1998
-+++ receiver.c	Wed Nov  4 18:59:23 1998
-@@ -387,6 +387,9 @@
- 			continue;
- 		}
- 
-+#ifdef HAVE_MKSTEMP
-+		fd2 = do_mkstemp(fnametmp);
-+#else
- 		if (NULL == do_mktemp(fnametmp)) {
- 			rprintf(FERROR,"mktemp %s failed\n",fnametmp);
- 			receive_data(f_in,buf,-1,NULL,file->length);
-@@ -402,6 +405,7 @@
- 		   this out */
- 		fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- 			      file->mode & ACCESSPERMS);
-+#endif
- 
- 		if (fd2 == -1 && relative_paths && errno == ENOENT && 
- 		    create_directory_path(fnametmp) == 0) {
diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab
deleted file mode 100644
index adeca790329..00000000000
--- a/net/rsync/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1998/11/05 00:24:38 mycroft Exp $
-
---- configure.in.orig	Tue Nov  3 17:00:45 1998
-+++ configure.in	Wed Nov  4 19:00:51 1998
-@@ -49,6 +49,7 @@
- AC_CHECK_FUNCS(mmap munmap waitpid getcwd strdup strerror chown chmod mknod)
- AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime)
- AC_CHECK_FUNCS(memmove getopt_long lchown vsnprintf snprintf setsid glob strpbrk)
-+AC_CHECK_FUNCS(mkstemp)
- 
- echo $ac_n "checking for working fnmatch... $ac_c"
- AC_TRY_RUN([#include <fnmatch.h>
diff --git a/net/rsync/patches/patch-ac b/net/rsync/patches/patch-ac
deleted file mode 100644
index a2df77cf045..00000000000
--- a/net/rsync/patches/patch-ac
+++ /dev/null
@@ -1,381 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1998/11/05 00:24:38 mycroft Exp $
-
---- configure.orig	Tue Nov  3 17:00:45 1998
-+++ configure	Wed Nov  4 19:01:13 1998
-@@ -2246,18 +2246,73 @@
- fi
- done
- 
-+for ac_func in mkstemp
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:2253: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2258 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
- 
- echo $ac_n "checking for working fnmatch... $ac_c"
- if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2256 "configure"
-+#line 2311 "configure"
- #include "confdefs.h"
- #include <fnmatch.h>
- main() { exit(fnmatch("*.o", "x.o", 0) == 0? 0: 1); }
- EOF
--if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   echo yes;cat >> confdefs.h <<\EOF
- #define HAVE_FNMATCH 1
-@@ -2274,7 +2329,7 @@
- 
- 
- echo $ac_n "checking for long long""... $ac_c" 1>&6
--echo "configure:2278: checking for long long" >&5
-+echo "configure:2333: checking for long long" >&5
- if eval "test \"`echo '$''{'rsync_cv_have_longlong'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2283,12 +2338,12 @@
-   rsync_cv_have_longlong=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2287 "configure"
-+#line 2342 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }
- EOF
--if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   rsync_cv_have_longlong=yes
- else
-@@ -2311,7 +2366,7 @@
- fi
- 
- echo $ac_n "checking for off64_t""... $ac_c" 1>&6
--echo "configure:2315: checking for off64_t" >&5
-+echo "configure:2370: checking for off64_t" >&5
- if eval "test \"`echo '$''{'rsync_cv_HAVE_OFF64_T'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2320,13 +2375,13 @@
-   rsync_cv_HAVE_OFF64_T=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2324 "configure"
-+#line 2379 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <sys/stat.h>
- main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
- EOF
--if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   rsync_cv_HAVE_OFF64_T=yes
- else
-@@ -2353,14 +2408,14 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2357 "configure"
-+#line 2412 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- main() { if (sizeof(ino_t) < sizeof(unsigned int)) return 0; return 1; }
- EOF
--if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   echo yes;cat >> confdefs.h <<\EOF
- #define HAVE_SHORT_INO_T 1
-@@ -2377,7 +2432,7 @@
- 
- 
- echo $ac_n "checking for unsigned char""... $ac_c" 1>&6
--echo "configure:2381: checking for unsigned char" >&5
-+echo "configure:2436: checking for unsigned char" >&5
- if eval "test \"`echo '$''{'rsync_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2386,12 +2441,12 @@
-   rsync_cv_HAVE_UNSIGNED_CHAR=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2390 "configure"
-+#line 2445 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- main() { char c; c=250; exit((c > 0)?0:1); }
- EOF
--if { (eval echo configure:2395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   rsync_cv_HAVE_UNSIGNED_CHAR=yes
- else
-@@ -2414,7 +2469,7 @@
- fi
- 
- echo $ac_n "checking for broken readdir""... $ac_c" 1>&6
--echo "configure:2418: checking for broken readdir" >&5
-+echo "configure:2473: checking for broken readdir" >&5
- if eval "test \"`echo '$''{'rsync_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2423,7 +2478,7 @@
-   rsync_cv_HAVE_BROKEN_READDIR=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2427 "configure"
-+#line 2482 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <dirent.h>
-@@ -2431,7 +2486,7 @@
- if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
- di->d_name[0] == 0) exit(0); exit(1);} 
- EOF
--if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   rsync_cv_HAVE_BROKEN_READDIR=yes
- else
-@@ -2454,13 +2509,13 @@
- fi
- 
- echo $ac_n "checking for utimbuf""... $ac_c" 1>&6
--echo "configure:2458: checking for utimbuf" >&5
-+echo "configure:2513: checking for utimbuf" >&5
- if eval "test \"`echo '$''{'rsync_cv_HAVE_UTIMBUF'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 2464 "configure"
-+#line 2519 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <utime.h>
-@@ -2468,7 +2523,7 @@
- struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
- ; return 0; }
- EOF
--if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   rsync_cv_HAVE_UTIMBUF=yes
- else
-@@ -2489,7 +2544,7 @@
- fi
- 
- echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6
--echo "configure:2493: checking for broken inet_ntoa" >&5
-+echo "configure:2548: checking for broken inet_ntoa" >&5
- if eval "test \"`echo '$''{'rsync_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2498,7 +2553,7 @@
-   rsync_cv_REPLACE_INET_NTOA=cross
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2502 "configure"
-+#line 2557 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -2510,7 +2565,7 @@
-     strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } 
- exit(1);}
- EOF
--if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   rsync_cv_REPLACE_INET_NTOA=yes
- else
-@@ -2541,12 +2596,12 @@
- for ac_func in connect
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2545: checking for $ac_func" >&5
-+echo "configure:2600: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2550 "configure"
-+#line 2605 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2569,7 +2624,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2597,7 +2652,7 @@
-     case "$LIBS" in
-     *-lnsl*) ;;
-     *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6
--echo "configure:2601: checking for printf in -lnsl_s" >&5
-+echo "configure:2656: checking for printf in -lnsl_s" >&5
- ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2605,7 +2660,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl_s  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2609 "configure"
-+#line 2664 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2616,7 +2671,7 @@
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2647,7 +2702,7 @@
-     case "$LIBS" in
-     *-lnsl*) ;;
-     *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6
--echo "configure:2651: checking for printf in -lnsl" >&5
-+echo "configure:2706: checking for printf in -lnsl" >&5
- ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2655,7 +2710,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2659 "configure"
-+#line 2714 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2666,7 +2721,7 @@
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2697,7 +2752,7 @@
-     case "$LIBS" in
-     *-lsocket*) ;;
-     *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:2701: checking for connect in -lsocket" >&5
-+echo "configure:2756: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2705,7 +2760,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2709 "configure"
-+#line 2764 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2716,7 +2771,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2747,7 +2802,7 @@
-     case "$LIBS" in
-     *-linet*) ;;
-     *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6
--echo "configure:2751: checking for connect in -linet" >&5
-+echo "configure:2806: checking for connect in -linet" >&5
- ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2755,7 +2810,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-linet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2759 "configure"
-+#line 2814 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2766,7 +2821,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
diff --git a/net/rsync/patches/patch-ad b/net/rsync/patches/patch-ad
deleted file mode 100644
index 266640f2dfc..00000000000
--- a/net/rsync/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:51 agc Exp $
-
---- config.h.in.orig	Thu Jun 18 06:30:21 1998
-+++ config.h.in	Sat Jul  4 05:49:12 1998
-@@ -133,6 +133,9 @@
- /* Define if you have the waitpid function.  */
- #undef HAVE_WAITPID
- 
-+/* Define if you have the mkstemp function.  */
-+#undef HAVE_MKSTEMP
-+
- /* Define if you have the <compat.h> header file.  */
- #undef HAVE_COMPAT_H
- 
diff --git a/net/rsync/patches/patch-ae b/net/rsync/patches/patch-ae
deleted file mode 100644
index 30909048cbd..00000000000
--- a/net/rsync/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1998/11/05 00:24:38 mycroft Exp $
-
---- syscall.c.orig	Tue May 26 10:43:43 1998
-+++ syscall.c	Wed Nov  4 19:11:19 1998
-@@ -103,12 +103,21 @@
- 	return mkdir(fname, mode);
- }
- 
-+#ifdef HAVE_MKSTEMP
-+int do_mkstemp(char *template)
-+{
-+	if (dry_run) return -1;
-+	if (read_only) {errno = EROFS; return -1;}
-+	return mkstemp(template);
-+}
-+#else
- char *do_mktemp(char *template)
- {
- 	if (dry_run) return NULL;
- 	if (read_only) {errno = EROFS; return NULL;}
- 	return mktemp(template);
- }
-+#endif
- 
- int do_stat(const char *fname, STRUCT_STAT *st)
- {
diff --git a/net/rsync/patches/patch-af b/net/rsync/patches/patch-af
deleted file mode 100644
index c5a91b5d1ad..00000000000
--- a/net/rsync/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 1998/11/05 00:24:38 mycroft Exp $
-
---- proto.h.orig	Tue Nov  3 17:00:46 1998
-+++ proto.h	Wed Nov  4 19:07:49 1998
-@@ -138,7 +138,11 @@
- int do_chmod(const char *path, mode_t mode);
- int do_rename(char *fname1, char *fname2);
- int do_mkdir(char *fname, mode_t mode);
-+#ifdef HAVE_MKSTEMP
-+int do_mkstemp(char *template);
-+#else
- char *do_mktemp(char *template);
-+#endif
- int do_stat(const char *fname, STRUCT_STAT *st);
- int do_lstat(const char *fname, STRUCT_STAT *st);
- int do_fstat(int fd, STRUCT_STAT *st);