# HG changeset patch
# User tomas klacko - Sun Microsystems - Prague Czech Republic <tomas.klacko@oracle.com>
# Date 1322835856 28800
# Node ID c0d139b44cad23cc2ad4c43ce0ca41e5040a9518
# Parent  8dca74ad1a2711a0ec0b1513dbdbe1da801afdf3
7111993 Problem with network/ftp_server

diff -r 8dca74ad1a27 -r c0d139b44cad components/proftpd/Makefile
--- a/components/proftpd/Makefile	Thu Dec 01 15:42:32 2011 -0800
+++ b/components/proftpd/Makefile	Fri Dec 02 06:24:16 2011 -0800
@@ -27,11 +27,11 @@
 
 COMPONENT_NAME=		proftpd
 COMPONENT_VERSION=	1.3.3
-COMPONENT_SUBVERSION=	e
+COMPONENT_SUBVERSION=	g
 HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:823e94c24447936ade6ae3948fe638077e0ba933
+COMPONENT_ARCHIVE_HASH=	sha1:11c2951526476d9f52307aa714851463aa76aa61
 COMPONENT_ARCHIVE_URL=	ftp://ftp.proftpd.org/distrib/source/$(COMPONENT_ARCHIVE)
 
 # mod_gss subcomponent
@@ -50,7 +50,7 @@
 # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
 # Because the IPS_COMPONENT_VERSION cannot contain letters we used '.0.5'
 # instead of 'e'.
-IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION).0.5
+IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION).0.7
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -I/usr/include/kerberosv5 -DHAVE_KRB5_H=1 -DKRB5_DLLIMP="
 # Force immediate binding because of chroot().
diff -r 8dca74ad1a27 -r c0d139b44cad components/proftpd/proftpd.license
--- a/components/proftpd/proftpd.license	Thu Dec 01 15:42:32 2011 -0800
+++ b/components/proftpd/proftpd.license	Fri Dec 02 06:24:16 2011 -0800
@@ -1,12 +1,14 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
+Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+
+This package may include technology which may be subject to one or more
+of the following additional notices:
+
+------------------
+- ProFTPD 1.3.3g -
+------------------
+
+Oracle Internal Tracking Number: 6824
+
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991