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: 06-Sep-2008 18:02:54
Branch: HEAD Handle: 2008090617025101
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.1 -> 1.3.2rc1
Summary:
Revision Changes Path
1.27 +11 -44 openpkg-src/proftpd/proftpd.patch
1.139 +3 -3 openpkg-src/proftpd/proftpd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 11 Oct 2007 15:58:07 -0000 1.26
+++ openpkg-src/proftpd/proftpd.patch 6 Sep 2008 16:02:51 -0000 1.27
@@ -1,6 +1,6 @@
Index: mod_otp/mod_otp.c
--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
-+++ mod_otp/mod_otp.c 2007-10-06 09:52:27 +0200
++++ mod_otp/mod_otp.c 2008-09-06 09:58:58 +0200
@@ -79,7 +79,7 @@
CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
@@ -21,7 +21,7 @@
}
Index: mod_time/mod_time.c
--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
-+++ mod_time/mod_time.c 2007-10-06 09:52:27 +0200
++++ mod_time/mod_time.c 2008-09-06 09:59:29 +0200
@@ -146,7 +146,7 @@
/* If we don't have a password file, we create an empty array and punt.
*/
@@ -78,45 +78,12 @@
return NULL;
time_user = pstrdup(session.pool, pw->pw_name);
-Index: modules/mod_auth_unix.c
---- modules/mod_auth_unix.c.orig 2006-06-29 19:16:23 +0200
-+++ modules/mod_auth_unix.c 2007-10-06 09:52:27 +0200
-@@ -243,7 +243,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;
-
-@@ -253,7 +253,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;
-
-@@ -263,7 +263,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
-Index: configure
---- configure.orig 2007-10-11 12:22:28.000000000 +0000
-+++ configure 2007-10-11 13:01:52.000000000 +0000
-@@ -19236,7 +19236,7 @@
- if test "${with_getopt+set}" = set; then
- withval="$with_getopt"
-
-- if test "$withval" != "no" ; then
-+ if test "$withval" = "no" ; then
-
- for ac_func in getopt
- do
+@@ -1603,7 +1603,7 @@
+ "%R", (session.c && session.c->remote_name ? session.c->remote_name
: "(unknown)"),
+ "%L", main_server->ServerFQDN,
+ "%U", user,
+- "%u", session.ident_user,
++ "%u", session.user,
+ "%M", mesg_max,
+ "%N", mesg_cur,
+ "%E", main_server->ServerAdmin,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.138 -r1.139 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 1 Jan 2008 15:03:11 -0000 1.138
+++ openpkg-src/proftpd/proftpd.spec 6 Sep 2008 16:02:52 -0000 1.139
@@ -22,8 +22,8 @@
##
# package version
-%define V_proftpd 1.3.1
-%define V_mod_exec 0.9.4
+%define V_proftpd 1.3.2rc1
+%define V_mod_exec 0.9.5
%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.3
%define V_mod_sql_sqlite 0.2
@@ -43,7 +43,7 @@
Group: FTP
License: GPL
Version: %{V_proftpd}
-Release: 20080101
+Release: 20080906
# package options
%option with_ifsession no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
