package/proftpd/proftpd-1.3.0a-bcopy.patch

   1 diff -urN proftpd-1.3.0a-0rig/ChangeLog proftpd-1.3.0a/ChangeLog
   2 --- proftpd-1.3.0a-0rig/ChangeLog       2006-04-16 23:39:01.000000000 +0200
   3 +++ proftpd-1.3.0a/ChangeLog    2007-09-24 08:18:14.000000000 +0200
   4 @@ -1,3 +1,11 @@
   5 +2007-09-24 08:00  ulfs
   6 +
   7 +       * contrib/mod_load/mod_load.c.in
   8 +       * include/conf.h
   9 +       * lib/glibc-glob.c
  10 +
  11 +       Replace bzero/bcopy with memset/memcpy
  12 +
  13  2006-04-16 14:36  castaglia
  14
  15         * contrib/dist/rpm/proftpd.spec, include/version.h, NEWS:
  16 diff -urN proftpd-1.3.0a-0rig/config.h.in proftpd-1.3.0a/config.h.in
  17 --- proftpd-1.3.0a-0rig/config.h.in     2005-10-20 01:28:30.000000000 +0200
  18 +++ proftpd-1.3.0a/config.h.in  2007-09-24 08:24:38.000000000 +0200
  19 @@ -190,7 +190,7 @@
  20  #undef STACK_DIRECTION
  21
  22  /* Define if you have the ANSI C header files.  */
  23 -#undef STDC_HEADERS
  24 +#define STDC_HEADERS   1
  25
  26  /* Define if you can safely include both <sys/time.h> and <time.h>.  */
  27  #undef TIME_WITH_SYS_TIME
  28 @@ -202,10 +202,10 @@
  29  #undef uid_t
  30
  31  /* The number of bytes in a short.  */
  32 -#undef SIZEOF_SHORT
  33 +#define SIZEOF_SHORT   2
  34
  35  /* The number of bytes in an int.  */
  36 -#undef SIZEOF_INT
  37 +#define SIZEOF_INT     4
  38
  39  /* The number of bytes in a long.  */
  40  #undef SIZEOF_LONG
  41 @@ -222,9 +222,6 @@
  42  /* The number of bytes in a time_t.  */
  43  #undef SIZEOF_TIME_T
  44
  45 -/* Define if you have the bcopy function.  */
  46 -#undef HAVE_BCOPY
  47 -
  48  /* Define if you have the crypt function.  */
  49  #undef HAVE_CRYPT
  50
  51 @@ -307,7 +304,7 @@
  52  #undef HAVE_INET_PTON
  53
  54  /* Define if you have the memcpy function.  */
  55 -#undef HAVE_MEMCPY
  56 +#define HAVE_MEMCPY    1
  57
  58  /* Define if you have the mempcpy function.  */
  59  #undef HAVE_MEMPCPY
  60 diff -urN proftpd-1.3.0a-0rig/contrib/mod_load/mod_load.c.in proftpd-1.3.0a/contrib/mod_load/mod_load.c.in
  61 --- proftpd-1.3.0a-0rig/contrib/mod_load/mod_load.c.in  2005-01-07 00:39:59.000000000 +0100
  62 +++ proftpd-1.3.0a/contrib/mod_load/mod_load.c.in       2007-09-24 08:02:01.000000000 +0200
  63 @@ -651,7 +651,7 @@
  64        for (i = 0; i < conf.config_maxclass; ++i)
  65          {
  66            struct class_stats stats;
  67 -          bzero ((char *) &stats, sizeof stats);
  68 +          memset ((char *) &stats, 0, sizeof stats);
  69
  70            desc.sd_type = CPUTYPE_CLASS;
  71            desc.sd_objid = i;
  72 diff -urN proftpd-1.3.0a-0rig/include/conf.h proftpd-1.3.0a/include/conf.h
  73 --- proftpd-1.3.0a-0rig/include/conf.h  2005-06-30 02:39:16.000000000 +0200
  74 +++ proftpd-1.3.0a/include/conf.h       2007-09-24 08:20:26.000000000 +0200
  75 @@ -118,10 +118,6 @@
  76  #  define strrchr rindex
  77  # endif
  78  char *strchr(),*strrchr();
  79 -# ifndef HAVE_MEMCPY
  80 -#  define memcpy(d,s,n) bcopy((s),(d),(n))
  81 -#  define memmove(d,s,n) bcopy((s),(d),(n))
  82 -# endif
  83  #endif
  84
  85  #ifdef HAVE_BSTRING_H
  86 @@ -264,13 +260,6 @@
  87  off_t lseek(int, off_t, int);
  88  #endif
  89
  90 -/* See if we have bcopy, if not define them to use the memcpy functions */
  91 -
  92 -#ifndef HAVE_BCOPY
  93 -# define bcopy(s,d,n)  memcpy((d),(s),(n))
  94 -# define bzero(d,n)    memset((d),0,(n))
  95 -#endif
  96 -
  97  /* Solaris has __vsnprintf, but no vsnprintf */
  98  #if ! defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF)
  99  # undef vsnprintf
 100 diff -urN proftpd-1.3.0a-0rig/lib/glibc-glob.c proftpd-1.3.0a/lib/glibc-glob.c
 101 --- proftpd-1.3.0a-0rig/lib/glibc-glob.c        2006-03-22 23:10:34.000000000 +0100
 102 +++ proftpd-1.3.0a/lib/glibc-glob.c     2007-09-24 08:07:48.000000000 +0200
 103 @@ -215,18 +215,8 @@
 104
 105  #ifndef        ANSI_STRING
 106
 107 -# ifndef bzero
 108 -extern void bzero ();
 109 -# endif
 110 -# ifndef bcopy
 111 -extern void bcopy ();
 112 -# endif
 113 -
 114 -# define memcpy(d, s, n)       bcopy ((s), (d), (n))
 115  # define strrchr       rindex
 116  /* memset is only used for zero here, but let's be paranoid.  */
 117 -# define memset(s, better_be_zero, n) \
 118 -  ((void) ((better_be_zero) == 0 ? (bzero((s), (n)), 0) : (abort(), 0)))
 119  #endif /* Not ANSI_STRING.  */
 120
 121  #if !defined HAVE_STRCOLL && !defined _LIBC
 122 diff -urN proftpd-1.3.0a-0rig/lib/libltdl/config-h.in proftpd-1.3.0a/lib/libltdl/config-h.in
 123 --- proftpd-1.3.0a-0rig/lib/libltdl/config-h.in 2004-10-29 07:17:55.000000000 +0200
 124 +++ proftpd-1.3.0a/lib/libltdl/config-h.in      2007-09-24 08:25:40.000000000 +0200
 125 @@ -21,9 +21,6 @@
 126  /* Define to 1 if you have the <assert.h> header file. */
 127  #undef HAVE_ASSERT_H
 128
 129 -/* Define to 1 if you have the `bcopy' function. */
 130 -#undef HAVE_BCOPY
 131 -
 132  /* Define to 1 if you have the `closedir' function. */
 133  #undef HAVE_CLOSEDIR
 134
 135 @@ -74,7 +71,7 @@
 136  #undef HAVE_MALLOC_H
 137
 138  /* Define to 1 if you have the `memcpy' function. */
 139 -#undef HAVE_MEMCPY
 140 +#define HAVE_MEMCPY    1
 141
 142  /* Define to 1 if you have the `memmove' function. */
 143  #undef HAVE_MEMMOVE
 144 @@ -180,7 +177,7 @@
 145  #undef PACKAGE_VERSION
 146
 147  /* Define to 1 if you have the ANSI C header files. */
 148 -#undef STDC_HEADERS
 149 +#define STDC_HEADERS   1
 150
 151  /* Define to empty if `const' does not conform to ANSI C. */
 152  #undef const
 153 diff -urN proftpd-1.3.0a-0rig/lib/libltdl/ltdl.c proftpd-1.3.0a/lib/libltdl/ltdl.c
 154 --- proftpd-1.3.0a-0rig/lib/libltdl/ltdl.c      2004-10-29 07:17:55.000000000 +0200
 155 +++ proftpd-1.3.0a/lib/libltdl/ltdl.c   2007-09-24 08:13:51.000000000 +0200
 156 @@ -372,9 +372,6 @@
 157           if you need that behaviour.  */
 158  #if ! HAVE_MEMCPY
 159
 160 -#  if HAVE_BCOPY
 161 -#    define memcpy(dest, src, size)    bcopy (src, dest, size)
 162 -#  else
 163  #    define memcpy rpl_memcpy
 164
 165  static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
 166 @@ -395,7 +392,6 @@
 167    return dest;
 168  }
 169
 170 -#  endif /* !HAVE_BCOPY */
 171  #endif   /* !HAVE_MEMCPY */
 172
 173  #if ! HAVE_MEMMOVE