OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 20-Jan-2003 12:19:36
Branch: HEAD Handle: 2003012011193402
Added files:
openpkg-src/proftpd proftpd-sizet.patch
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
patch against glibc-poking, now compiles on FreeBSD5 with system gcc
Summary:
Revision Changes Path
1.1 +51 -0 openpkg-src/proftpd/proftpd-sizet.patch
1.43 +3 -1 openpkg-src/proftpd/proftpd.spec
1.2950 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd-sizet.patch
============================================================================
$ cvs diff -u -r0 -r1.1 proftpd-sizet.patch
--- /dev/null 2003-01-20 12:19:36.000000000 +0100
+++ proftpd-sizet.patch 2003-01-20 12:19:36.000000000 +0100
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 3 Jan 2003 11:36:07 -0000 1.42
+++ openpkg-src/proftpd/proftpd.spec 20 Jan 2003 11:19:36 -0000 1.43
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.2.7
-Release: 20030103
+Release: 20030120
# package options
%option with_pam no
@@ -44,6 +44,7 @@
Source2: proftpd.msg.goaway
Source3: proftpd.msg.login
Source4: rc.proftpd
+Patch0: proftpd-sizet.patch
# build information
Prefix: %{l_prefix}
@@ -75,6 +76,7 @@
%prep
%setup -q
+ %patch0 -p0
%build
# make non-standard "rundir" the same as standard "sysconfdir"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2949 -r1.2950 news.txt
--- openpkg-web/news.txt 20 Jan 2003 11:18:21 -0000 1.2949
+++ openpkg-web/news.txt 20 Jan 2003 11:19:34 -0000 1.2950
@@ -1,3 +1,4 @@
+20-Jan-2003: Upgraded package: P<proftpd-1.2.7-20030120>
20-Jan-2003: Upgraded package: P<perl-dbi-20030120-20030120>
20-Jan-2003: Upgraded package: P<calamaris-2.56-20030120>
19-Jan-2003: Upgraded package: P<libmcrypt-2.5.6-20030119>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
