From be5309b025139ac0ceb3bc7c837e3fb47c99914a Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Mon, 8 Oct 2007 19:22:45 +0000 Subject: [PATCH] - Add vendor patch to fix bug - Authoritative PAM is not honored - Bump portrevision Reported by: TJ Saunders (developer) Approved by: sat (mentor, implicit) --- ftp/proftpd-devel/Makefile | 1 + ftp/proftpd-devel/files/patch-src-auth.c | 43 ++++++++++++++++++++++++ ftp/proftpd/Makefile | 1 + ftp/proftpd/files/patch-src-auth.c | 43 ++++++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 ftp/proftpd-devel/files/patch-src-auth.c create mode 100644 ftp/proftpd/files/patch-src-auth.c diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index bf8501c4ef26..e3ab3a76a711 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ diff --git a/ftp/proftpd-devel/files/patch-src-auth.c b/ftp/proftpd-devel/files/patch-src-auth.c new file mode 100644 index 000000000000..61386a883e9f --- /dev/null +++ b/ftp/proftpd-devel/files/patch-src-auth.c @@ -0,0 +1,43 @@ +ndex: src/auth.c +=================================================================== +RCS file: /cvsroot/proftp/proftpd/src/auth.c,v +retrieving revision 1.52 +diff -u -r1.52 auth.c +--- src/auth.c 5 Oct 2007 17:04:13 -0000 1.52 ++++ src/auth.c 8 Oct 2007 18:44:21 -0000 +@@ -503,6 +503,17 @@ + return res; + } + ++ if (MODRET_ISERROR(mr)) { ++ res = MODRET_ERROR(mr); ++ ++ if (cmd->tmp_pool) { ++ destroy_pool(cmd->tmp_pool); ++ cmd->tmp_pool = NULL; ++ } ++ ++ return res; ++ } ++ + m = NULL; + } + +@@ -566,6 +577,17 @@ + return res; + } + ++ if (MODRET_ISERROR(mr)) { ++ res = MODRET_ERROR(mr); ++ ++ if (cmd->tmp_pool) { ++ destroy_pool(cmd->tmp_pool); ++ cmd->tmp_pool = NULL; ++ } ++ ++ return res; ++ } ++ + m = NULL; + } + diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index bf8501c4ef26..e3ab3a76a711 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ diff --git a/ftp/proftpd/files/patch-src-auth.c b/ftp/proftpd/files/patch-src-auth.c new file mode 100644 index 000000000000..61386a883e9f --- /dev/null +++ b/ftp/proftpd/files/patch-src-auth.c @@ -0,0 +1,43 @@ +ndex: src/auth.c +=================================================================== +RCS file: /cvsroot/proftp/proftpd/src/auth.c,v +retrieving revision 1.52 +diff -u -r1.52 auth.c +--- src/auth.c 5 Oct 2007 17:04:13 -0000 1.52 ++++ src/auth.c 8 Oct 2007 18:44:21 -0000 +@@ -503,6 +503,17 @@ + return res; + } + ++ if (MODRET_ISERROR(mr)) { ++ res = MODRET_ERROR(mr); ++ ++ if (cmd->tmp_pool) { ++ destroy_pool(cmd->tmp_pool); ++ cmd->tmp_pool = NULL; ++ } ++ ++ return res; ++ } ++ + m = NULL; + } + +@@ -566,6 +577,17 @@ + return res; + } + ++ if (MODRET_ISERROR(mr)) { ++ res = MODRET_ERROR(mr); ++ ++ if (cmd->tmp_pool) { ++ destroy_pool(cmd->tmp_pool); ++ cmd->tmp_pool = NULL; ++ } ++ ++ return res; ++ } ++ + m = NULL; + } +