OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2006 16:13:16
Branch: OPENPKG_2_STABLE Handle: 2006062715131600
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
MFC: get rid of inline/static combination which GCC disliked at least
under 64-bit platforms like FreeBSD/amd64
Summary:
Revision Changes Path
1.12.2.1 +30 -0 openpkg-src/proftpd/proftpd.patch
1.105.2.2 +1 -1 openpkg-src/proftpd/proftpd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
============================================================================
$ cvs diff -u -r1.12 -r1.12.2.1 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 7 Nov 2005 20:37:58 -0000 1.12
+++ openpkg-src/proftpd/proftpd.patch 27 Jun 2006 14:13:16 -0000 1.12.2.1
@@ -19,3 +19,33 @@
};
static authtable otp_authtab[] = {
+Index: modules/mod_auth_unix.c
+--- modules/mod_auth_unix.c.orig 2005-07-03 20:52:02 +0200
++++ modules/mod_auth_unix.c 2006-06-27 16:10:20 +0200
+@@ -248,7 +248,7 @@
+ return gr;
+ }
+
+-inline static int _compare_uid(idmap_t *m1, idmap_t *m2) {
++static int _compare_uid(idmap_t *m1, idmap_t *m2) {
+ if (m1->id.uid < m2->id.uid)
+ return -1;
+
+@@ -258,7 +258,7 @@
+ return 0;
+ }
+
+-inline static int _compare_gid(idmap_t *m1, idmap_t *m2) {
++static int _compare_gid(idmap_t *m1, idmap_t *m2) {
+ if (m1->id.gid < m2->id.gid)
+ return -1;
+
+@@ -268,7 +268,7 @@
+ return 0;
+ }
+
+-inline static int _compare_id(xaset_t **table, idauth_t id, idauth_t
idcomp) {
++static int _compare_id(xaset_t **table, idauth_t id, idauth_t idcomp) {
+ if (table == uid_table)
+ return id.uid == idcomp.uid;
+ else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.105.2.1 -r1.105.2.2 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 20 Jun 2006 15:23:56 -0000
1.105.2.1
+++ openpkg-src/proftpd/proftpd.spec 27 Jun 2006 14:13:16 -0000
1.105.2.2
@@ -43,7 +43,7 @@
Group: FTP
License: GPL
Version: %{V_proftpd}
-Release: 2.20060622
+Release: 2.20060627
# package options
%option with_ifsession no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
