[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-68-ge0d6651

Mahyuddin Susanto udienz at ubuntu.com
Mon Mar 26 16:28:55 UTC 2012 

The following commit has been merged in the master branch:
commit 8d6228d4624a41b5a2eaf39a0a2e50ccdddf4095
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Mon Mar 26 23:25:51 2012 +0700

    * debian/copyright:
     - Resync with latest dep5 format.
     - Use stand-alone license paragraph for repeatable license.
     - Use whitespace instead of comma separated for Files fields.
    * debian/control:
     - Bump Standards-Version to 3.9.3.
    * debian/rules: Enabled hardened flags, patch from Moritz Muehlenhoff.
      (Closes: #657213)
    * debian/changelog: Wrap latest changelog line 3 to 80 line, thanks lintian.
    * debian/proftpd-basic.install: Add missing sftp-sql modules.
      (Closes: 665191)
    
    Signed-off-by: Mahyuddin Susanto <udienz at ubuntu.com>

diff --git a/debian/changelog b/debian/changelog
index 8913ee7..473b2c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,29 @@
 proftpd-dfsg (1.3.4a-2) UNRELEASED; urgency=low
 
   * Team upload.
-  * Fix typo in proftpd.conf templates line 133, thanks John Smith (Closes: #655630)
+  * Fix typo in proftpd.conf templates line 133, thanks John Smith.
+    (Closes: #655630)
   * Updated Danish translations, thanks Joe Dalton. (Closes: #659326)
-
- -- Mahyuddin Susanto <udienz at ubuntu.com>  Sun, 25 Mar 2012 18:11:56 +0700
+  * debian/copyright:
+    - Resync with latest dep5 format.
+    - Use stand-alone license paragraph for repeatable license.
+    - Use whitespace instead of comma separated for Files fields.
+  * debian/control:
+    - Bump Standards-Version to 3.9.3.
+  * debian/rules: Enabled hardened flags, patch from Moritz Muehlenhoff.
+    (Closes: #657213)
+  * debian/changelog: Wrap latest changelog line 3 to 80 line, thanks lintian.
+  * debian/proftpd-basic.install: Add missing sftp-sql modules.
+    (Closes: 665191)
+
+ -- Mahyuddin Susanto <udienz at ubuntu.com>  Mon, 26 Mar 2012 23:22:55 +0700
 
 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.
+  * Now enabled PCRE instead of glibc POSIX regex and added required
+    libpcre3-dev build-dep.
   * Added libpcre3-dev dependency to libproftpd-dev due to header files
     inclusion.
 
diff --git a/debian/control b/debian/control
index 148b502..078cd62 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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,
diff --git a/debian/control.in b/debian/control.in
index cf569e6..f3ec91b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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,
diff --git a/debian/copyright b/debian/copyright
index e4a2537..71916f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,15 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ 
 Upstream-Name: ProFTPD
 Upstream-Contact: The ProFTPD Project team, TJ Saunders <tj at castaglia.org>
 Source: http://www.proftpd.org/
 
 Files: *
-Copyright:  1997-1998, Public Flood Software
-	1999-2000, MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
-	2001-2008, The ProFTPD Project team
-	2001-2008, TJ Saunders <tj at castaglia.org>
+Copyright: 1997, 1998 Public Flood Software
+	1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
+	2001, 2008 The ProFTPD Project team
+	2001, 2008 TJ Saunders <tj at castaglia.org>
+License: GPL-2+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -30,10 +32,12 @@ Comment: As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Di
  with OpenSSL, and distribute the resulting executable, without including
  the source code for OpenSSL in the source distribution.
 
-Files: src/xferlog*, include/xferlog.h, contrib/xferstats.holger-preiss
+Files: src/xferlog* include/xferlog.h contrib/xferstats.holger-preiss
 Copyright: 1999-2000, WU-FTPD Development Group
 	1998, Holger Preiss (TU Dresden)
 License: Academic
+
+License: Academic
  Copyright (c) 1994  Washington University in Saint Louis.
  All rights reserved.
  .
diff --git a/debian/proftpd-basic.install b/debian/proftpd-basic.install
index bc24bca..b58157f 100644
--- a/debian/proftpd-basic.install
+++ b/debian/proftpd-basic.install
@@ -21,6 +21,7 @@ usr/lib/proftpd/mod_rewrite.so
 usr/lib/proftpd/mod_shaper.so
 usr/lib/proftpd/mod_site_misc.so
 usr/lib/proftpd/mod_sftp.so
+usr/lib/proftpd/mod_sftp_sql.so
 usr/lib/proftpd/mod_sftp_pam.so
 usr/lib/proftpd/mod_sql.so
 usr/lib/proftpd/mod_sql_passwd.so                                                                                                                           
diff --git a/debian/rules b/debian/rules
index b1fe1b8..79e7ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,26 +12,19 @@ VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -
 PROFTPD_FLAGS := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_OPENSSL -DUSE_LDAP_TLS
 CFLAGS := $(PROFTPD_FLAGS) 
 CC := gcc
-OPTFLAG = -O2
 
 # Some special build options
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
   DEVELOPT=--enable-devel=yes
-  OPTFLAG = -O0
 endif
 ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
 DH_VERBOSE=1
 export DH_VERBOSE
 endif
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  OPTFLAG = -O0 
-endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
   INSTALL_STRIP=-s
 endif
 
-CFLAGS += $(OPTFLAG)
-
 #
 # dpkg-arch rules
 # 
@@ -66,7 +59,7 @@ build: debian/proftpd-substvars configure-stamp build-stamp
 build-stamp: 
 	dh_testdir
 	
-	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all
+	$(MAKE) CC="$(CC)" all
 	
 	touch $@
 
@@ -90,7 +83,7 @@ configure-stamp:
 		mv ./config.guess ./config.guess.original && \
 		cp -f /usr/share/misc/config.guess ./config.guess
 	
-	./configure $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
+	./configure $(shell dpkg-buildflags --export=configure) $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
 	
 	touch $@
 

-- 
ProFTPD core package

More information about the Pkg-proftpd-maintainers mailing list