reopen 666950
severity wishlist
tags 666950 + patch
retitle 666950 sqlite support should be in separate package, not in main 
postfix package
thanks

On 12.04.2012 20:22, Michael Tokarev wrote:
> On 12.04.2012 18:51, Debian Bug Tracking System wrote:
>>    [LaMont Jones]
>>    * Link with and use sqlite when building dict_sqlite.  add sqlite
>>      dictionary to dynamicmaps.cf. Closes: #666950
> 
> Hmm.  This is not what the bug is about, isn't it?  Quoting my bugreport
> again:
> 
>> New postfix release (2.9) includes new map type sqlite, in
>> /usr/lib/postfix/dict_sqlite.so.  As done with other optional
>> maps, this should go into a separate package. This is related
>> to #666693 -- build deps are okay already, but not compile
>> flags (CCARGS&Co).
> 
> Shouldn't we introduce postfix-sqlite package, as done for all
> other map types with external dependencies (unlike those like
> regexp provided by glibc), instead of shipping dict_sqlite.so
> in the main postfix package?
> 
> I think this bug should be reopened, but before doing so I want
> to hear the reasoning about why postfix-sqlite subpackage has
> not been introduced.

Ok, the reasoning is that libsqlite3-0 package is "almost"
essential, that is, it gets used by tools usually installed
on a system, f.e. python-twisted, or aptitude.

But I found that out of 200+ servers in use here, only
one has this library installed, and that's only due to
python-twisted which is a dependency of pyicqt which we
run on this one server.  All the rest run postfix and
don't have it installed.

Another argument was that libsqlite is small compared
with other map types which are made separate.  This
goes in contrast with cdb support which is smallest
of all them, yet is a separate postfix-cdb package.
So "small size" (which isn't exactly small, the library
is about 700kb on i386) is not an argument either.

I'm providing a patch which splits dict_sqlite into a
separate postfix-sqlite package, against current
version of postfix package, 2.9.1-3.  The support
files are based on those from pgsql map.  I verified
that the new packages are installable correctly.

Thanks!

/mjt
diff --git a/debian/control b/debian/control
index fcffbba..4b61ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,15 @@ Description: PostgreSQL map support for Postfix
  This provides support for PostgreSQL maps in Postfix. If you plan to use
  PostgreSQL maps with Postfix, you need this.
 
+Package: postfix-sqlite
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Description: SQLite map support for Postfix
+ ${Description}
+ .
+ This provides support for SQLite maps in Postfix. If you plan to use
+ SQLite maps with Postfix, you need this.
+
 Package: postfix-dev
 Architecture: all
 Section: devel
diff --git a/debian/postfix-sqlite.README.Debian b/debian/postfix-sqlite.README.Debian
new file mode 100644
index 0000000..e57593d
--- /dev/null
+++ b/debian/postfix-sqlite.README.Debian
@@ -0,0 +1,2 @@
+The postfix-doc package contains documentation on how to configure this
+map type.  See /usr/share/doc/postfix/html/SQLITE_README.html
diff --git a/debian/postfix-sqlite.copyright b/debian/postfix-sqlite.copyright
new file mode 100644
index 0000000..8c8014e
--- /dev/null
+++ b/debian/postfix-sqlite.copyright
@@ -0,0 +1,318 @@
+This is the Debian GNU/Linux prepackaged version of Postfix, a mail transport
+agent.
+
+Postfix was created by Wietse Venema <wie...@porcupine.org>; the Debian
+package has been assembled by LaMont Jones <lam...@debian.org> from sources
+available from http://www.postfix.org, and can be cloned from git via:
+	git clone git://git.debian.org/~lamont/postfix.git
+
+
+    Copyright (c) 1999, International Business Machines Corporation
+    and others. All Rights Reserved.
+
+The following copyright and license applies to this software:
+
+    IBM PUBLIC LICENSE VERSION 1.0 - SECURE MAILER
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM PUBLIC
+    LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
+    PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+    1.  DEFINITIONS
+
+    "Contribution" means:
+	a) in the case of International Business Machines Corporation ("IBM"),
+	   the Original Program, and
+	b) in the case of each Contributor,
+	   i)  changes to the Program, and
+	   ii) additions to the Program;
+	       where such changes and/or additions to the Program originate
+	       from and are distributed by that particular Contributor.
+	       A Contribution 'originates' from a Contributor if it was added
+	       to the Program by such Contributor itself or anyone acting on
+	       such Contributor's behalf.
+	Contributions do not include additions to the Program which:
+	   (i)  are separate modules of software distributed in conjunction
+		with the Program under their own license agreement, and
+	   (ii) are not derivative works of the Program.
+
+    "Contributor" means IBM and any other entity that distributes the Program.
+
+    "Licensed Patents " mean patent claims licensable by a Contributor which
+    are necessarily infringed by the use or sale of its Contribution alone
+    or when combined with the Program.
+
+    "Original Program" means the original version of the software accompanying
+    this Agreement as released by IBM, including source code, object code
+    and documentation, if any.
+
+    "Program" means the Original Program and Contributions.
+
+    "Recipient" means anyone who receives the Program under this Agreement,
+    including all Contributors.
+
+    2.  GRANT OF RIGHTS
+
+	a) Subject to the terms of this Agreement, each Contributor hereby
+	grants Recipient a non-exclusive, worldwide, royalty-free copyright
+	license to reproduce, prepare derivative works of, publicly display,
+	publicly perform, distribute and sublicense the Contribution of such
+	Contributor, if any, and such derivative works, in source code and
+	object code form.
+
+	b) Subject to the terms of this Agreement, each Contributor hereby
+	grants Recipient a non-exclusive, worldwide, royalty-free patent
+	license under Licensed Patents to make, use, sell, offer to sell,
+	import and otherwise transfer the Contribution of such Contributor,
+	if any, in source code and object code form.  This patent license
+	shall apply to the combination of the Contribution and the Program
+	if, at the time the Contribution is added by the Contributor, such
+	addition of the Contribution causes such combination to be covered
+	by the Licensed Patents.  The patent license shall not apply to any
+	other combinations which include the Contribution.  No hardware per
+	se is licensed hereunder.
+
+	c) Recipient understands that although each Contributor grants the
+	licenses to its Contributions set forth herein, no assurances are
+	provided by any Contributor that the Program does not infringe the
+	patent or other intellectual property rights of any other entity.
+	Each Contributor disclaims any liability to Recipient for claims
+	brought by any other entity based on infringement of intellectual
+	property rights or otherwise.  As a condition to exercising the rights
+	and licenses granted hereunder, each Recipient hereby assumes sole
+	responsibility to secure any other intellectual property rights
+	needed, if any.  For example, if a third party patent license
+	is required to allow Recipient to distribute the Program, it is
+	Recipient's responsibility to acquire that license before distributing
+	the Program.
+
+	d) Each Contributor represents that to its knowledge it has sufficient
+	copyright rights in its Contribution, if any, to grant the copyright
+	license set forth in this Agreement.
+
+    3.  REQUIREMENTS
+
+    A Contributor may choose to distribute the Program in object code form
+    under its own license agreement, provided that:
+	a) it complies with the terms and conditions of this Agreement; and
+	b) its license agreement:
+	   i)   effectively disclaims on behalf of all Contributors all
+		warranties and conditions, express and implied, including
+		warranties or conditions of title and non-infringement, and
+		implied warranties or conditions of merchantability and fitness
+		for a particular purpose;
+	   ii)  effectively excludes on behalf of all Contributors all
+		liability for damages, including direct, indirect, special,
+		incidental and consequential damages, such as lost profits;
+	   iii) states that any provisions which differ from this Agreement
+		are offered by that Contributor alone and not by any other
+		party; and
+	   iv)  states that source code for the Program is available from
+		such Contributor, and informs licensees how to obtain it in a
+		reasonable manner on or through a medium customarily used for
+		software exchange.
+
+    When the Program is made available in source code form:
+	a) it must be made available under this Agreement; and
+	b) a copy of this Agreement must be included with each copy of the
+	   Program.
+
+    Each Contributor must include the following in a conspicuous location
+    in the Program:
+
+	Copyright (c) 1997,1998,1999, International Business Machines
+	Corporation and others. All Rights Reserved.
+
+    In addition, each Contributor must identify itself as the originator of
+    its Contribution, if any, in a manner that reasonably allows subsequent
+    Recipients to identify the originator of the Contribution.
+
+    4.  COMMERCIAL DISTRIBUTION
+
+    Commercial distributors of software may accept certain responsibilities
+    with respect to end users, business partners and the like.  While this
+    license is intended to facilitate the commercial use of the Program, the
+    Contributor who includes the Program in a commercial product offering
+    should do so in a manner which does not create potential liability for
+    other Contributors.   Therefore, if a Contributor includes the Program in
+    a commercial product offering, such Contributor ("Commercial Contributor")
+    hereby agrees to defend and indemnify every other Contributor
+    ("Indemnified Contributor") against any losses, damages and costs
+    (collectively "Losses") arising from claims, lawsuits and other legal
+    actions brought by a third party against the Indemnified Contributor to
+    the extent caused by the acts or omissions of such Commercial Contributor
+    in connection with its distribution of the Program in a commercial
+    product offering.  The obligations in this section do not apply to any
+    claims or Losses relating to any actual or alleged intellectual property
+    infringement.  In order to qualify, an Indemnified Contributor must:
+	a) promptly notify the Commercial Contributor in writing of such claim,
+    and
+	b) allow the Commercial Contributor to control, and cooperate with
+	   the Commercial Contributor in, the defense and any related
+	   settlement negotiations.  The Indemnified Contributor may
+	   participate in any such claim at its own expense.
+
+    For example, a Contributor might include the Program in a commercial
+    product offering, Product X.  That Contributor is then a Commercial
+    Contributor.  If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone.  Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those performance
+    claims and warranties, and if a court requires any other Contributor to
+    pay any damages as a result, the Commercial Contributor must pay those
+    damages.
+
+    5.  NO WARRANTY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
+    ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining
+    the appropriateness of using and distributing the Program and assumes
+    all risks associated with its exercise of rights under this Agreement,
+    including but not limited to the risks and costs of program errors,
+    compliance with applicable laws, damage to or loss of data, programs or
+    equipment, and unavailability or interruption of operations.
+
+    6.  DISCLAIMER OF LIABILITY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+    ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION
+    OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    7.  GENERAL
+
+    If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further action
+    by the parties hereto, such provision shall be reformed to the minimum
+    extent necessary to make such provision valid and enforceable.
+
+    If Recipient institutes patent litigation against a Contributor with
+    respect to a patent applicable to software (including a cross-claim or
+    counterclaim in a lawsuit), then any patent licenses granted by that
+    Contributor to such Recipient under this Agreement shall terminate
+    as of the date such litigation is filed.  In addition, If Recipient
+    institutes patent litigation against any entity (including a cross-claim
+    or counterclaim in a lawsuit) alleging that the Program itself (excluding
+    combinations of the Program with other software or hardware) infringes
+    such Recipient's patent(s), then such Recipient's rights granted under
+    Section 2(b) shall terminate as of the date such litigation is filed.
+
+    All Recipient's rights under this Agreement shall terminate if it fails
+    to comply with any of the material terms or conditions of this Agreement
+    and does not cure such failure in a reasonable period of time after
+    becoming aware of such noncompliance.  If all Recipient's rights under
+    this Agreement terminate, Recipient agrees to cease use and distribution
+    of the Program as soon as reasonably practicable.  However, Recipient's
+    obligations under this Agreement and any licenses granted by Recipient
+    relating to the Program shall continue and survive.
+
+    IBM may publish new versions (including revisions) of this Agreement
+    from time to time.  Each new version of the Agreement will be given a
+    distinguishing version number.  The Program (including Contributions)
+    may always be distributed subject to the version of the Agreement under
+    which it was received. In addition, after a new version of the Agreement
+    is published, Contributor may elect to distribute the Program (including
+    its Contributions) under the new version. No one other than IBM has the
+    right to modify this Agreement.  Except as expressly stated in Sections
+    2(a) and 2(b) above, Recipient receives no rights or licenses to the
+    intellectual property of any Contributor under this Agreement, whether
+    expressly, by implication, estoppel or otherwise.  All rights in the
+    Program not expressly granted under this Agreement are reserved.
+
+    This Agreement is governed by the laws of the State of New York and the
+    intellectual property laws of the United States of America. No party to
+    this Agreement will bring a legal action under this Agreement more than
+    one year after the cause of action arose.  Each party waives its rights
+    to a jury trial in any resulting litigation.
+
+The following license applies to rmail, distributed with Postfix:
+
+			     SENDMAIL LICENSE
+
+    The following license terms and conditions apply, unless a different
+    license is obtained from Sendmail, Inc., 6425 Christie Ave, Fourth Floor,
+    Emeryville, CA 94608, or by electronic mail at lice...@sendmail.com.
+
+    License Terms:
+
+    Use, Modification and Redistribution (including distribution of any
+    modified or derived work) in source and binary forms is permitted only if
+    each of the following conditions is met:
+
+    1. Redistributions qualify as "freeware" or "Open Source Software" under
+       one of the following terms:
+
+       (a) Redistributions are made at no charge beyond the reasonable cost of
+	   materials and delivery.
+
+       (b) Redistributions are accompanied by a copy of the Source Code or by an
+	   irrevocable offer to provide a copy of the Source Code for up to three
+	   years at the cost of materials and delivery.  Such redistributions
+	   must allow further use, modification, and redistribution of the Source
+	   Code under substantially the same terms as this license.  For the
+	   purposes of redistribution "Source Code" means the complete compilable
+	   and linkable source code of sendmail including all modifications.
+
+    2. Redistributions of source code must retain the copyright notices as they
+       appear in each source code file, these license terms, and the
+       disclaimer/limitation of liability set forth as paragraph 6 below.
+
+    3. Redistributions in binary form must reproduce the Copyright Notice,
+       these license terms, and the disclaimer/limitation of liability set
+       forth as paragraph 6 below, in the documentation and/or other materials
+       provided with the distribution.  For the purposes of binary distribution
+       the "Copyright Notice" refers to the following language:
+       "Copyright (c) 1998-2000 Sendmail, Inc.  All rights reserved."
+
+    4. Neither the name of Sendmail, Inc. nor the University of California nor
+       the names of their contributors may be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.  The name "sendmail" is a trademark of Sendmail, Inc.
+
+    5. All redistributions must comply with the conditions imposed by the
+       University of California on certain embedded code, whose copyright
+       notice and conditions for redistribution are as follows:
+
+       (a) Copyright (c) 1988, 1993 The Regents of the University of
+	   California.  All rights reserved.
+
+       (b) Redistribution and use in source and binary forms, with or without
+	   modification, are permitted provided that the following conditions
+	   are met:
+
+	  (i)   Redistributions of source code must retain the above copyright
+		notice, this list of conditions and the following disclaimer.
+
+	  (ii)  Redistributions in binary form must reproduce the above
+		copyright notice, this list of conditions and the following
+		disclaimer in the documentation and/or other materials provided
+		with the distribution.
+
+	  (iii) Neither the name of the University nor the names of its
+		contributors may be used to endorse or promote products derived
+		from this software without specific prior written permission.
+
+    6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY
+       SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+       WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+       MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+       NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF
+       CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+       INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+       NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+       USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+       ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+       THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    $Revision: 1.1.4.3 $, Last updated $Date: 2003/07/23 16:13:15 $
+
diff --git a/debian/postfix-sqlite.dirs b/debian/postfix-sqlite.dirs
new file mode 100644
index 0000000..fb3a177
--- /dev/null
+++ b/debian/postfix-sqlite.dirs
@@ -0,0 +1 @@
+usr/lib/postfix
diff --git a/debian/postfix-sqlite.files b/debian/postfix-sqlite.files
new file mode 100644
index 0000000..2727248
--- /dev/null
+++ b/debian/postfix-sqlite.files
@@ -0,0 +1 @@
+usr/lib/postfix/dict_sqlite.so
diff --git a/debian/postfix-sqlite.postinst b/debian/postfix-sqlite.postinst
new file mode 100644
index 0000000..7062c2d
--- /dev/null
+++ b/debian/postfix-sqlite.postinst
@@ -0,0 +1,49 @@
+#! /bin/sh
+# postinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+. /usr/share/postfix/postinst.functions
+
+case "$1" in
+    configure)
+	addmap sqlite
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/postfix-sqlite.prerm b/debian/postfix-sqlite.prerm
new file mode 100644
index 0000000..0112f1d
--- /dev/null
+++ b/debian/postfix-sqlite.prerm
@@ -0,0 +1,37 @@
+#! /bin/sh
+# prerm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+#       install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index 4016a90..09ca35f 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -234,7 +234,6 @@ if [ ! -f dynamicmaps.cf ]; then
 #====	================================	=============	============
 EOF
     addmap tcp
-    addmap sqlite
 else
     # handle dynamicmaps.cf upgrade - we checked with the user in preinst.
     if [ -f /var/spool/postfix/dynamicmaps_upgrade ]; then
diff --git a/debian/rules b/debian/rules
index 765c473..a8582d0 100644
--- a/debian/rules
+++ b/debian/rules
@@ -112,7 +112,7 @@ install: build
 	install lib/dict_pcre.so ${base}-pcre/${plibdir}
 	install lib/dict_mysql.so ${base}-mysql/${plibdir}
 	install lib/dict_pgsql.so ${base}-pgsql/${plibdir}
-	install lib/dict_sqlite.so ${base}/${plibdir}
+	install lib/dict_sqlite.so ${base}-sqlite/${plibdir}
 	install lib/dict_tcp.so ${base}/${plibdir}
 	install lib/dict_cdb.so ${base}-cdb/${plibdir}
 	install libexec/[a-z]* ${base}/${plibdir}

Reply via email to