Browse Source

patch against glibc-poking, now compiles on FreeBSD5 with system gcc

master
Michael van Elst 23 years ago committed by Ralf S. Engelschall
parent
commit
bb4ab18e6a
  1. 51
      proftpd/proftpd-sizet.patch
  2. 4
      proftpd/proftpd.spec

51
proftpd/proftpd-sizet.patch

@ -0,0 +1,51 @@
--- include/glibc-glob.h Mon Jan 20 11:59:41 2003
+++ include/glibc-glob.h Mon Jan 20 12:08:48 2003
@@ -49,24 +49,6 @@
# define __PMT(x) __P(x)
#endif
-/* We need `size_t' for the following definitions. */
-#ifndef __size_t
-# if defined __GNUC__ && __GNUC__ >= 2
-typedef __SIZE_TYPE__ __size_t;
-# ifdef _XOPEN_SOURCE
-typedef __SIZE_TYPE__ size_t;
-# endif
-# else
-/* This is a guess. */
-typedef unsigned long int __size_t;
-# endif
-#else
-/* The GNU CC stddef.h version defines __size_t as empty. We need a real
- definition. */
-# undef __size_t
-# define __size_t size_t
-#endif
-
/* Bits set in the FLAGS argument to `glob'. */
#define GLOB_ERR (1 << 0)/* Return on read errors. */
#define GLOB_MARK (1 << 1)/* Append a slash to each name. */
@@ -117,9 +99,9 @@
#endif
typedef struct
{
- __size_t gl_pathc; /* Count of paths matched by the pattern. */
+ size_t gl_pathc; /* Count of paths matched by the pattern. */
char **gl_pathv; /* List of matched pathnames. */
- __size_t gl_offs; /* Slots to reserve in `gl_pathv'. */
+ size_t gl_offs; /* Slots to reserve in `gl_pathv'. */
int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
@@ -147,9 +129,9 @@
# endif
typedef struct
{
- __size_t gl_pathc;
+ size_t gl_pathc;
char **gl_pathv;
- __size_t gl_offs;
+ size_t gl_offs;
int gl_flags;
/* If the GLOB_ALTDIRFUNC flag is set, the following functions

4
proftpd/proftpd.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
Group: FTP
License: GPL
Version: 1.2.7
Release: 20030103
Release: 20030120
# package options
%option with_pam no
@ -44,6 +44,7 @@ Source1: proftpd.conf
Source2: proftpd.msg.goaway
Source3: proftpd.msg.login
Source4: rc.proftpd
Patch0: proftpd-sizet.patch
# build information
Prefix: %{l_prefix}
@ -75,6 +76,7 @@ AutoReqProv: no
%prep
%setup -q
%patch0 -p0
%build
# make non-standard "rundir" the same as standard "sysconfdir"

Loading…
Cancel
Save