[SCM] proftpd-mod-geoip branch, master, updated. upstream/0.2-6-gdbeb561
Fabrizio Regalli
fabreg at fabreg.it
Thu Mar 17 12:26:32 UTC 2011
The following commit has been merged in the master branch:
commit d6e25f89991c77e3ff07dd6513b98fa020fa2b47
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date: Tue Mar 15 23:21:22 2011 +0100
Clean up the source
diff --git a/debian/proftpd-mod-geoip/DEBIAN/control b/debian/proftpd-mod-geoip/DEBIAN/control
deleted file mode 100644
index 6bf726a..0000000
--- a/debian/proftpd-mod-geoip/DEBIAN/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Package: proftpd-mod-geoip
-Version: 0.2
-Architecture: i386
-Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
-Installed-Size: 120
-Depends: proftpd-basic (>= 1.3.2c), libc6 (>= 2.3.4), libgeoip1 (>= 1.4.7~beta11+dfsg)
-Section: net
-Priority: optional
-Homepage: http://www.castaglia.org/proftpd/modules/mod_geoip.html
-Description: proftpd mod_geoip
- This is mod_geoip module for profptd.
- The mod_geoip module uses the GeoIP library from MaxMind
- to look up various geographic information for a connecting client
diff --git a/debian/proftpd-mod-geoip/DEBIAN/md5sums b/debian/proftpd-mod-geoip/DEBIAN/md5sums
deleted file mode 100644
index dc59d5e..0000000
--- a/debian/proftpd-mod-geoip/DEBIAN/md5sums
+++ /dev/null
@@ -1,7 +0,0 @@
-6e9cbabe8e15c1f19706b394135415b9 usr/lib/proftpd/mod_geoip.a
-7822ed3d305c9dbe33f5221c8289fb91 usr/lib/proftpd/mod_geoip.la
-527b8be835c017e83654f8fed62ce668 usr/lib/proftpd/mod_geoip.so
-4c307aaeb2c9cc78bf0af2d6fd766128 usr/share/doc-base/proftpd-mod-geoip
-a2bc43979ba9bc4ba6a20ae575b54950 usr/share/doc/proftpd-mod-geoip/changelog.gz
-480322a48627321e831cadde48420188 usr/share/doc/proftpd-mod-geoip/copyright
-2be9b6cd0b14c319d19bdbcd3c1f3c84 usr/share/doc/proftpd-mod-geoip/mod_geoip.html
diff --git a/debian/proftpd-mod-geoip/DEBIAN/postrm b/debian/proftpd-mod-geoip/DEBIAN/postrm
deleted file mode 100755
index 392bdbe..0000000
--- a/debian/proftpd-mod-geoip/DEBIAN/postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -d /usr/lib/proftpd ]; then
- echo "Deleting mod_geoip.."
- rm -f /usr/lib/proftpd/mod_geoip.so
-fi
-
-
-
diff --git a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.a b/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.a
deleted file mode 100644
index 3db64d3..0000000
Binary files a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.a and /dev/null differ
diff --git a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.la b/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.la
deleted file mode 100644
index 1b1664b..0000000
--- a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# mod_geoip.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='mod_geoip.so'
-
-# Names of this library.
-library_names='mod_geoip.so mod_geoip.so mod_geoip.so'
-
-# The name of the static archive.
-old_library='mod_geoip.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -lGeoIP'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for mod_geoip.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib/proftpd'
diff --git a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.so b/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.so
deleted file mode 100644
index 01cbf2d..0000000
Binary files a/debian/proftpd-mod-geoip/usr/lib/proftpd/mod_geoip.so and /dev/null differ
diff --git a/debian/proftpd-mod-geoip/usr/share/doc-base/proftpd-mod-geoip b/debian/proftpd-mod-geoip/usr/share/doc-base/proftpd-mod-geoip
deleted file mode 100644
index 8be4356..0000000
--- a/debian/proftpd-mod-geoip/usr/share/doc-base/proftpd-mod-geoip
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: proftpd-mod-geoip
-Title: Documentation for the mod_geoip ProFTPD
-Author:
-Abstract: Configuration reference, modules documentation, FAQs and HOWTOs
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/proftpd-mod-geoip/mod_geoip.html
-Files: /usr/share/doc/proftpd-mod-geoip/*.html
-
diff --git a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/changelog.gz b/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/changelog.gz
deleted file mode 100644
index a691f6f..0000000
Binary files a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/changelog.gz and /dev/null differ
diff --git a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/copyright b/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/copyright
deleted file mode 100644
index a68fc2f..0000000
--- a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/copyright
+++ /dev/null
@@ -1,30 +0,0 @@
-Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: mod_geoip
-Upstream-Contact: TJ Saunders
-Source: http://www.castaglia.org/proftpd/modules/mod_geoip.html
-
-Files: *
-Copyright: 2007-2010, TJ Saunders
-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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-Files: debian/*
-Copyright: 2011, Fabrizio Regalli <fabreg at fabreg.it>
-License: GPL-2+
-
diff --git a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/mod_geoip.html b/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/mod_geoip.html
deleted file mode 100644
index 0fdf864..0000000
--- a/debian/proftpd-mod-geoip/usr/share/doc/proftpd-mod-geoip/mod_geoip.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!-- $Id: mod_geoip.html,v 1.4 2010/10/29 00:01:09 tj Exp tj $ -->
-<!-- $Source: /home/tj/proftpd/modules/doc/RCS/mod_geoip.html,v $ -->
-
-<html>
-<head>
-<title>ProFTPD module mod_geoip</title>
-</head>
-
-<body bgcolor=white>
-
-<hr>
-<center>
-<h2><b>ProFTPD module <code>mod_geoip</code></b></h2>
-</center>
-<hr><br>
-
-<p>
-The <code>mod_geoip</code> module uses the GeoIP library from MaxMind to
-look up various geographic information for a connecting client:
-<pre>
- <a href="http://www.maxmind.com/app/c">http://www.maxmind.com/app/c</a>
-</pre>
-This information can be used to set access controls for the server.
-
-<p>
-This module is contained in the <code>mod_geoip</code> file for
-ProFTPD 1.3.<i>x</i>, and is not compiled by default. Installation
-instructions are discussed <a href="#Installation">here</a>.
-
-<p>
-The most current version of <code>mod_geoip</code> can be found at:
-<pre>
- <a href="http://www.castaglia.org/proftpd/">http://www.castaglia.org/proftpd/</a>
-</pre>
-
-<p>
-This product includes GeoLite data created by MaxMind, available from
-<a href="http://www.maxmind.com/">http://www.maxmind.com/</a>.
-
-<h2>Author</h2>
-<p>
-Please contact TJ Saunders <tj <i>at</i> castaglia.org> with any
-questions, concerns, or suggestions regarding this module.
-
-<h2>Directives</h2>
-<ul>
- <li><a href="#GeoIPAllowFilter">GeoIPAllowFilter</a>
- <li><a href="#GeoIPDenyFilter">GeoIPDenyFilter</a>
- <li><a href="#GeoIPEngine">GeoIPEngine</a>
- <li><a href="#GeoIPLog">GeoIPLog</a>
- <li><a href="#GeoIPTable">GeoIPTable</a>
-</ul>
-
-<hr>
-<h2><a name="GeoIPAllowFilter">GeoIPAllowFilter</a></h2>
-<strong>Syntax:</strong> GeoIPAllowFilter <em>filter</em> <em>pattern</em><br>
-<strong>Default:</strong> <em>none</em><br>
-<strong>Context:</strong> "server config", <VirtualHost>, <Global><br>
-<strong>Module:</strong> mod_geoip<br>
-<strong>Compatibility:</strong> 1.3.3rc1 and later
-
-<p>
-The <code>GeoIPAllowFilter</code> directive is used to configure ACLs based
-on the geographic data provided by the GeoIP library.
-
-<p>
-Multiple <code>GeoIPAllowFilter</code> directives in the configuration are
-supported; if <b>any</b> filter matches the connecting client, the connection
-will be allowed.
-
-<p>
-The <em>filter</em> parameter specifies the GeoIP value to which to apply
-the configured <em>pattern</em> for matching. The possible <em>filter</em>
-values are:
-<ul>
- <li><code>AreaCode</code>
- <li><code>ASN</code>
- <li><code>City</code>
- <li><code>Continent</code>
- <li><code>CountryCode</code>
- <li><code>CountryCode3</code>
- <li><code>CountryName</code>
- <li><code>ISP</code>
- <li><code>Latitude</code>
- <li><code>Longitude</code>
- <li><code>NetworkSpeed</code>
- <li><code>Organization</code>
- <li><code>PostalCode</code>
- <li><code>Proxy</code>
- <li><code>RegionCode</code>
- <li><code>RegionName</code>
- <li><code>Timezone</code>
-</ul>
-
-<p>
-The <em>pattern</em> parameter is <b>case-insensitive</b> regular expression
-that will be applied to the specified <em>filter</em> value, if available.
-
-<p>
-Examples:
-<pre>
- # Allow clients with high-speed connections
- GeoIPAllowFilter NetworkSpeed corporate
-
- # Reject clients connecting from North America or South America
- GeoIPDenyFilter Continent (NA|SA)
-</pre>
-
-<p>
-<hr>
-<h2><a name="GeoIPDenyFilter">GeoIPDenyFilter</a></h2>
-<strong>Syntax:</strong> GeoIPDenyFilter <em>filter</em> <em>pattern</em><br>
-<strong>Default:</strong> <em>none</em><br>
-<strong>Context:</strong> "server config", <VirtualHost>, <Global><br>
-<strong>Module:</strong> mod_geoip<br>
-<strong>Compatibility:</strong> 1.3.3rc1 and later
-
-<p>
-The <code>GeoIPDenyFilter</code> directive is used to configure ACLs based
-on the geographic data provided by the GeoIP library.
-
-<p>
-Multiple <code>GeoIPDenyFilter</code> directives in the configuration are
-supported; if <b>any</b> filter matches the connecting client, the connection
-will be rejected.
-
-<p>
-See <a href="#GeoIPAllowFilter"><code>GeoIPAllowFilter</code></a> for
-a description of the directive syntax and parameters.
-
-<p>
-<hr>
-<h2><a name="GeoIPEngine">GeoIPEngine</a></h2>
-<strong>Syntax:</strong> GeoIPEngine <em>on|off</em><br>
-<strong>Default:</strong> <em>off</em><br>
-<strong>Context:</strong> "server config", <VirtualHost>, <Global><br>
-<strong>Module:</strong> mod_geoip<br>
-<strong>Compatibility:</strong> 1.3.3rc1 and later
-
-<p>
-The <code>GeoIPEngine</code> directive enables or disables the module's
-lookup of geographic information for a connecting client, and subsequent
-enforcement of any configured ACLs.
-
-<p>
-<hr>
-<h2><a name="GeoIPLog">GeoIPLog</a></h2>
-<strong>Syntax:</strong> GeoIPLog <em>file|"none"</em><br>
-<strong>Default:</strong> <em>None</em><br>
-<strong>Context:</strong> "server config", <VirtualHost>, <Global><br>
-<strong>Module:</strong> mod_geoip<br>
-<strong>Compatibility:</strong> 1.3.3rc1 and later
-
-<p>
-The <code>GeoIPLog</code> directive is used to specify a log file for
-<code>mod_geoip</code>'s reporting on a per-server basis. The <em>file</em>
-parameter given must be the full path to the file to use for logging.
-
-<p>
-Note that this path must <b>not</b> be to a world-writable directory and,
-unless <code>AllowLogSymlinks</code> is explicitly set to <em>on</em>
-(generally a bad idea), the path must <b>not</b> be a symbolic link.
-
-<p>
-<hr>
-<h2><a name="GeoIPTable">GeoIPTable</a></h2>
-<strong>Syntax:</strong> GeoIPTable <em>path</em> <em>[flags]</em><br>
-<strong>Default:</strong> <em>None</em><br>
-<strong>Context:</strong> "server config", <VirtualHost>, <Global><br>
-<strong>Module:</strong> mod_geoip<br>
-<strong>Compatibility:</strong> 1.3.3rc1 and later
-
-<p>
-The <code>GeoIPTable</code> directive is used to a GeoIP database file
-for use by the GeoIP library. The <em>path</em> parameter given must be the
-full path to the database file.
-
-<p>
-If no <code>GeoIPTable</code> directive is configured, then the GeoIP library
-will use the default GeoIP Country database file installed with the library.
-Otherwise, <b>only</b> the database files configured via <code>GeoIPTable</code>
-directives will be used.
-
-<p>
-Multiple <code>GeoIPTable</code> directives can be used to configure
-multiple different GeoIP database files for use at the same time.
-
-<p>
-The possible <em>flags</em> values supported are:
-<ul>
- <li><code>Standard</code>
- <p>
- Reads the database from the filesystem; uses the least memory but causes
- database to be read for each connection.
- </li>
-
- <p>
- <li><code>MemoryCache</code>
- <p>
- Loads the database into memory; faster performance but uses the most
- memory. Tables configured with <code>MemoryCache</code> are loaded
- into the parent process memory, avoiding the need to read them for
- each connection.
- </li>
-
- <p>
- <li><code>CheckCache</code>
- <p>
- Causes the GeoIP library to check for database updates. If the database
- has been updated, the library will automatically reload the file and/or
- memory cache.
- </li>
-
- <p>
- <li><code>IndexCache</code>
- <p>
- Loads just the most frequently accessed index portion of the database
- into memory, resulting in faster lookups than <code>Standard</code> but
- less memory usage than <code>MemoryCache</code>. This can be useful
- for larger databases such as GeoIP Organization and GeoIP City.
- </li>
-
- <p>
- <li><code>MMapCache</code>
- <p>
- Loads the database into <code>mmap</code> shared memory.
- </li>
-
- <p>
- <li><code>UTF8</code>
- <p>
- Tells the GeoIP library to return UTF8 strings for the data obtained
- from this database file. By default, the GeoIP library uses ISO-8859-1
- encoded strings.
- </li>
-</ul>
-Multiple different flags can be configured.
-
-<p>
-Examples:
-<pre>
- GeoIPTable /path/to/GeoIP.dat MemoryCache CheckCache
- GeoIPTable /path/to/GeoISP.dat Standard
- GeoIPTable /path/to/GeoIPCity.dat IndexCache
-</pre>
-
-<p>
-<hr>
-<h2><a name="Installation">Installation</a></h2>
-The <code>mod_geoip</code> module requires that the GeoIP library be installed.
-
-<p>
-After installing GeoIP, follow the usual steps for using contrib modules in
-proftpd:
-To install <code>mod_geoip</code>, copy the <code>mod_unique_id.c</code>
-file into:
-<pre>
- cp mod_geoip.c <i>proftpd-dir</i>/contrib/
-</pre>
-after unpacking the latest proftpd-1.3 source code. For including
-<code>mod_geoip</code> as a staticly linked module:
-<pre>
- ./configure --with-modules=mod_geoip
-</pre>
-Alternatively, <code>mod_geoip</code> could be built as a DSO module:
-<pre>
- ./configure --with-shared=mod_geoip
-</pre>
-Then follow the usual steps:
-<pre>
- make
- make install
-</pre>
-You may need to specify the location of the GeoIP header and library files in
-your <code>configure</code> command, <i>e.g.</i>:
-<pre>
- ./configure --with-modules=mod_geoip \
- --with-includes=/usr/local/geoip/include \
- --with-libraries=/usr/local/geoip/lib
-</pre>
-
-<p>
-Alternatively, if your proftpd was compiled with DSO support, you can
-use the <code>prxs</code> tool to build <code>mod_geoip</code> as a shared
-module:
-<pre>
- prxs -c -i -d mod_geoip.c
-</pre>
-
-<p>
-<hr>
-<h2><a name="Usage">Usage</a></h2>
-
-<p>
-<b>Access Controls</b><br>
-If any <code>GeoIPAllowFilter</code> or <code>GeoIPDenyFilter</code>
-directives are configured, the <code>mod_geoip</code> module applies them
-against the geographic information retrieved from the GeoIP library. First
-any <code>GeoIPAllowFilter</code>s are checked. If <i>any</i> of these
-filters matches the connecting client's information, the connection is allowed.
-Next, any <code>GeoIPDenyFilter</code>s are checked. If <i>any</i> of these
-filters matches the connecting client's information, the connection is closed.
-Otherwise, the connection is allowed.
-
-<p>
-This means that if you wanted to reject connections from the US <i>except</i>
-for connections from California, you might use something like this:
-<pre>
- # Deny all connections from the US
- GeoIPDenyFilter CountryCode US
-
- # But allow connections from California
- GeoIPAllowFilter RegionCode CA
-</pre>
-
-<p>
-<b>Environment Variables</b><br>
-The <code>mod_geoip</code> module will set the following environment
-variables whenever a client connects, assuming that the appropriate
-GeoIP tables have been configured:
-<ul>
- <li><code>GEOIP_AREA_CODE</code>
- <li><code>GEOIP_ASN</code>
- <li><code>GEOIP_CITY</code>
- <li><code>GEOIP_CONTINENT_CODE</code>
- <li><code>GEOIP_COUNTRY_CODE</code> (<i>two-letter country code</i>)
- <li><code>GEOIP_COUNTRY_CODE3</code> (<i>three-letter country code</i>)
- <li><code>GEOIP_COUNTRY_NAME</code>
- <li><code>GEOIP_ISP</code>
- <li><code>GEOIP_LATITUDE</code>
- <li><code>GEOIP_LONGITUDE</code>
- <li><code>GEOIP_NETSPEED</code>
- <li><code>GEOIP_ORGANIZATION</code>
- <li><code>GEOIP_POSTAL_CODE</code>
- <li><code>GEOIP_PROXY</code>
- <li><code>GEOIP_REGION</code>
- <li><code>GEOIP_REGION_NAME</code>
- <li><code>GEOIP_TIMEZONE</code>
-</ul>
-These values are also available in the <code>session.notes</code> table,
-under keys of the names above.
-
-<p>
-<b>Example Configuration</b><br>
-
-<pre>
- <IfModule mod_geoip.c>
- GeoIPEngine on
- GeoIPLog /path/to/ftpd/geoip.log
-
- # Load GeoLite city database into memory on server startup, and use
- # UTF8-encoded city names
- GeoIPTable /path/to/GeoLiteCity.dat MemoryCache UTF8
-
- # Add your GeoIPAllowFilter/GeoIPDenyFilter rules here
- </IfModule>
-</pre>
-
-<p>
-<b>Logging</b><br>
-The <code>mod_geoip</code> module supports different forms of logging. The
-main module logging is done via the <code>GeoIPLog</code> directive.
-For debugging purposes, the module also uses <a href="http://www.proftpd.org/docs/howto/Tracing.html">trace logging</a>, via the module-specific "geoip" log
-channel. Thus for trace logging, to aid in debugging, you
-would use the following in your <code>proftpd.conf</code>:
-<pre>
- TraceLog /path/to/ftpd/trace.log
- Trace geoip:20
-</pre>
-The geographic information retrieved from the GeoIP library for the
-connecting client is logged using this "geoip" trace log channel. This trace
-logging can generate large files; it is intended for debugging
-use only, and should be removed from any production configuration.
-
-<p>
-<b>Suggested Future Features</b><br>
-The following lists the features I hope to add to <code>mod_geoip</code>,
-according to need, demand, inclination, and time:
-<ul>
- <li>Configure a message to be sent to rejected clients
- <li>Support requiring <i>all</i> <code>GeoIPAllowFilter</code>/<code>GeoIPDenyFilter</code> to apply, in addition to <i>any</i>
-</ul>
-
-<p><a name="FAQ">
-<b>Frequently Asked Questions</b><br>
-
-<p><a name="GeoIPWhitelist">
-<font color=red>Question</font>: How I can whitelist specific clients from
-<code>mod_geoip</code>'s checking?<br>
-<font color=blue>Answer</font>: You should be able to easily do this using
-<a href="http://www.proftpd.org/docs/howto/Classes.html">classes</a>and the
-<code>mod_ifsession</code> module. For example:
-<pre>
- <Class geop-whitelist>
- From 1.2.3.4
- </Class>
-
- <IfModule mod_geoip.c>
- # Add the normal mod_geoip directives here <b>except</b> <code>GeoIPEngine</code>
- </IfModule>
-
- <IfClass geoip-whitelist>
- # Disable mod_geoip for the whitelisted clients
- GeoIPEngine off
- </IfClass>
-
- <IfClass !geoip-whitelist>
- # Enable mod_geoip for all non-whitelisted clients
- GeoIPEngine on
- </IfClass>
-</pre>
-
-<p>
-<hr><br>
-
-Author: <i>$Author: tj $</i><br>
-Last Updated: <i>$Date: 2010/10/29 00:01:09 $</i><br>
-
-<br><hr>
-
-<font size=2><b><i>
-© Copyright 2010 TJ Saunders<br>
- All Rights Reserved<br>
-</i></b></font>
-
-<hr><br>
-
-</body>
-</html>
-
--
mod_geoip for proftpd
More information about the Pkg-proftpd-maintainers
mailing list