[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4_rc3-64-g5c21ec6

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 07e841284414638903f51bbaa031f0c475616ea9
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Nov 21 13:09:08 2011 +0100

    New upstream release and added PCRE support.

diff --git a/debian/changelog b/debian/changelog
index 3eb6538..063bda3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+proftpd-dfsg (1.3.4a-1) unstable; urgency=low
+
+  * New upstream release.
+  * Merged patch removed: 3711.
+  * Now enabled PCRE instead of glibc POSIX regex and added required libpcre3-dev 
+    build-dep.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 21 Nov 2011 13:06:14 +0100
+
 proftpd-dfsg (1.3.4~rc3-2) unstable; urgency=high
 
   * Added libacl1-dev and libssl-dev to proftpd-dev dependencies, due to
diff --git a/debian/control b/debian/control
index 0202cd4..aec17bc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev, 
  libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any], 
- autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev
+ autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
+ libpcre3-dev
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
@@ -18,7 +19,7 @@ Depends: netbase (>= 4.13), ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5.
 Conflicts: ftp-server
 Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.4rc3
+Provides: ftp-server, proftpd, proftpd-abi-1.3.4a
 Suggests: proftpd-doc, openssl, 
  proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, 
  openbsd-inetd | inet-superserver
diff --git a/debian/control.in b/debian/control.in
index 712763b..971533c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev, 
  libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any], 
- autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev
+ autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
+ libpcre3-dev
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
diff --git a/debian/patches/3711 b/debian/patches/3711
deleted file mode 100644
index 45daafc..0000000
--- a/debian/patches/3711
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: proftpd-dfsg/src/main.c
-===================================================================
---- proftpd-dfsg.orig/src/main.c	2011-11-11 13:03:50.000000000 +0100
-+++ proftpd-dfsg/src/main.c	2011-11-11 13:10:03.000000000 +0100
-@@ -651,6 +651,9 @@
-         cmd->argv[0]);
-       pr_response_flush(&resp_err_list);
- 
-+      /* Restore any previous pool to the Response API. */
-+      pr_response_set_pool(resp_pool);
-+
-       errno = xerrno;
-       return success;
-     }
-@@ -718,6 +721,9 @@
-         break;
- 
-       default:
-+        /* Restore any previous pool to the Response API. */
-+        pr_response_set_pool(resp_pool);
-+
-         errno = EINVAL;
-         return -1;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 131f837..da36ad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ mod_cap
 odbc
 silent
 use_hypen_in_manpage
-3711
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index 9242756..bbd0e12 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.4rc3 
+proftpd:Depends=proftpd-abi-1.3.4a 
diff --git a/debian/rules b/debian/rules
index b94b46c..28c9951 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
-	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog $(DEVELOPT)
+	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)

-- 
ProFTPD core package