[SCM] proftpd-mod-dnsbl branch, master, updated. upstream/0.1.5-7-g611aa43
Mahyuddin Susanto
udienz at ubuntu.com
Sun Mar 6 08:48:38 UTC 2011
The following commit has been merged in the master branch:
commit 611aa4310a67a355b50a80be43958b5e978fb3e1
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date: Sun Mar 6 15:47:39 2011 +0700
adding template configuration, remove dh-autoreconf from BD and fixing ABI issue
diff --git a/debian/control b/debian/control
index cddd798..d526aa5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,10 @@ Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Mahyuddin Susanto <udienz at ubuntu.com>
Build-Depends: autotools-dev,
- debhelper (>= 7),
- quilt (>= 0.46-7~),
- proftpd-dev,
- libacl1-dev,
- dh-autoreconf
+ debhelper (>= 7),
+ libacl1-dev,
+ proftpd-dev (>= 1.3.1rc1),
+ quilt (>= 0.46-7~)
Standards-Version: 3.9.1
Homepage: http://www.castaglia.org/proftpd/modules/mod_dnsbl.html
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-mod-dnsbl.git
@@ -16,12 +15,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-mod-dnsbl.git;a=summar
Package: proftpd-mod-dnsbl
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: proftpd-basic (>= 1.3.2c), ${misc:Depends}, ${shlibs:Depends}
Description: ProFTPD module mod_dnsbl
ProFTPD module for mod-dnsbl (DNS Black-List/Block-List)
.
- A DNS blacklist is a way in which the DNS can be used to
- "blacklist" sites/addresses that have been deemd to be
- "bad" in some way. These blacklists are often used by
- email servers, for determining and rejecting email sent
+ A DNS blacklist is a way in which the DNS can be used to
+ "blacklist" sites/addresses that have been deemd to be
+ "bad" in some way. These blacklists are often used by
+ email servers, for determining and rejecting email sent
by addresses known to be sources of spam.
diff --git a/debian/control b/debian/control.in
similarity index 59%
copy from debian/control
copy to debian/control.in
index cddd798..31044fe 100644
--- a/debian/control
+++ b/debian/control.in
@@ -4,11 +4,10 @@ Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Mahyuddin Susanto <udienz at ubuntu.com>
Build-Depends: autotools-dev,
- debhelper (>= 7),
- quilt (>= 0.46-7~),
- proftpd-dev,
- libacl1-dev,
- dh-autoreconf
+ debhelper (>= 7),
+ libacl1-dev,
+ proftpd-dev (>= 1.3.1rc1),
+ quilt (>= 0.46-7~)
Standards-Version: 3.9.1
Homepage: http://www.castaglia.org/proftpd/modules/mod_dnsbl.html
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-mod-dnsbl.git
@@ -16,12 +15,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-mod-dnsbl.git;a=summar
Package: proftpd-mod-dnsbl
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: proftpd-basic (>= @VERSION@), ${misc:Depends}, ${shlibs:Depends}
Description: ProFTPD module mod_dnsbl
ProFTPD module for mod-dnsbl (DNS Black-List/Block-List)
.
- A DNS blacklist is a way in which the DNS can be used to
- "blacklist" sites/addresses that have been deemd to be
- "bad" in some way. These blacklists are often used by
- email servers, for determining and rejecting email sent
+ A DNS blacklist is a way in which the DNS can be used to
+ "blacklist" sites/addresses that have been deemd to be
+ "bad" in some way. These blacklists are often used by
+ email servers, for determining and rejecting email sent
by addresses known to be sources of spam.
diff --git a/debian/proftpd-mod-dnsbl.dirs b/debian/proftpd-mod-dnsbl.dirs
index 669898d..f0e8d4e 100644
--- a/debian/proftpd-mod-dnsbl.dirs
+++ b/debian/proftpd-mod-dnsbl.dirs
@@ -1 +1,2 @@
usr/lib/proftpd
+usr/share/proftpd/templates
diff --git a/debian/rules b/debian/rules
index 4ad7812..34ed70a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,29 @@
#!/usr/bin/make -f
# -*- makefile -*-
+MOD_NAME=dnsbl
+MOD_FULLNAME=mod_dnsbl
+MOD_DEBNAME=proftpd-mod-dnsbl
+
+VERSION=$(shell grep PROFTPD_VERSION_TEXT /usr/include/proftpd/version.h|cut -d\" -f2)
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-clean:
+debian/control: debian/control.in
+ sed -e 's/@VERSION@/$(VERSION)/' $< >$@
+
+debian/proftpd-mod-dnsbl-substvars: debian/proftpd-mod-dnsbl-substvars.in
+ sed -e 's/@VERSION@/$(VERSION)/' $< >$@
+
+clean: debian/control
dh_testdir
dh_testroot
- rm -f build-stamp *.la *.lo
+ rm -f build-stamp *.la *.lo *.o
rm -rf .libs/
dh_clean
-config.status: configure
+config.status: debian/control configure
dh_testdir
dh_auto_configure
@@ -24,7 +36,7 @@ build-stamp: config.status
install: build
dh_prep
dh_installdirs
- prxs -c mod_dnsbl.c
+ prxs -c $(MOD_FULLNAME).c
# Build architecture-independent files here.
binary-indep: build install
@@ -36,6 +48,10 @@ binary-indep: build install
dh_installchangelogs
dh_strip
dh_link
+
+ install -m 644 debian/templates/$(MOD_NAME).conf debian/$(MOD_DEBNAME)/usr/share/doc/$(MOD_DEBNAME)/$(MOD_NAME).conf
+
+ dh_link usr/share/doc/$(MOD_DEBNAME)/$(MOD_NAME).conf usr/share/proftpd/templates/$(MOD_NAME).conf
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..1c36003
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+# Don't store changes on autogenerated files
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|config\.status|config\.log|mod_dnsbl\.h|Makefile)$"
diff --git a/debian/templates/dnsbl.conf b/debian/templates/dnsbl.conf
new file mode 100644
index 0000000..43eeac1
--- /dev/null
+++ b/debian/templates/dnsbl.conf
@@ -0,0 +1,31 @@
+#
+# Proftpd sample configuration for dnsbl.
+#
+<IfModule mod_dnsbl.c>
+# Syntax: DNSBLDomain domain
+# Default: None
+
+DNSBLDomain sbl.spamhaus.org
+DNSBLDomain xbl.spamhaus.org
+
+# Syntax: DNSBLEngine on|off
+# Default: None
+# usually used inside a <VirtualHost> section to enable DNS blacklist
+# use for a particular virtual host.
+DNSBLEngine on
+
+# Syntax: DNSBLLog file
+# Default: None
+DNSBLLog /var/log/proftpd/mod_dnsbl.log
+
+# Syntax: DNSBLPolicy "allow,deny"|"deny,allow"
+# Default: None
+# If DNSBLPolicy is configured using "allow,deny", then the mod_dnsbl module
+# will allow the connection, unless the connecting client is blacklisted
+# by any of the configured DNSBLDomain sites.
+# If DNSBLPolicy is configured using "deny,allow", then the mod_dnsbl module
+# will not allow the connection, unless the connecting client is listed by
+# any of the configured DNSBLDomain sites.
+DNSBLPolicy "allow,deny"
+
+</IfModule>
--
mod_dnsbl for proFTPD
More information about the Pkg-proftpd-maintainers
mailing list