From: Stefan Hornburg (Racke) Date: Fri, 13 Apr 2012 06:53:02 +0000 (+0200) Subject: Imported Debian patch 0.63.0-6 X-Git-Tag: debian/0.63.0-6^0 X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/commitdiff_plain/940be80e3e40dbbbd84161e1e5ae3abf0b2eadf6 Imported Debian patch 0.63.0-6 --- 940be80e3e40dbbbd84161e1e5ae3abf0b2eadf6 diff --cc debian/changelog index 88916bc,0000000..1eda501 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,199 -1,0 +1,291 @@@ ++courier-authlib (0.63.0-6) unstable; urgency=low ++ ++ [Martin Orr ] ++ ++ * Set SELinux context for runtime directories in init script ++ (Closes: #668564) ++ ++ -- Stefan Hornburg (Racke) Fri, 13 Apr 2012 08:53:02 +0200 ++ ++courier-authlib (0.63.0-5) unstable; urgency=low ++ ++ [ Moritz Muehlenhoff ] ++ ++ * Enable hardened build flags (Closes: #655168) ++ ++ [ Peter Eisentraut ] ++ ++ * Add support for "status" action to authdaemon init script ++ ++ -- Stefan Hornburg (Racke) Sat, 07 Apr 2012 16:48:52 +0200 ++ ++courier-authlib (0.63.0-4) unstable; urgency=low ++ ++ * Remove umask check from debian/rules (Closes: #634599, thanks to Lucas ++ Nussbaum for the report) ++ ++ -- Stefan Hornburg (Racke) Wed, 31 Aug 2011 13:32:46 +0200 ++ ++courier-authlib (0.63.0-3.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Empty dependency_libs (Closes: #621191). ++ ++ -- Luk Claes Tue, 28 Jun 2011 07:23:00 +0200 ++ ++courier-authlib (0.63.0-3) unstable; urgency=low ++ ++ [ Simon McVittie ] ++ * Add a symbols file for libcourier*.so to work around the library name ++ being unsuitable for dpkg-shlibdeps (based on a suggestion from ++ Steve Langasek, Closes: #554788) ++ * Tell dh_makeshlibs and dh_shlibdeps to look in the non-standard library ++ directory ++ * Make distclean rather than clean to avoid garbage in the Debian diff when ++ building twice (patch from Peter Eisentraut, Closes: #527971) ++ ++ -- Stefan Hornburg (Racke) Mon, 11 Oct 2010 10:20:03 +0200 ++ ++courier-authlib (0.63.0-2) unstable; urgency=low ++ ++ * rebuild to really fix MySQL dependency (Closes: #574101) ++ * recreation of directories in /var/run uses correct ++ ownership/permissions now (Closes: #429866) ++ ++ -- Stefan Hornburg (Racke) Fri, 19 Mar 2010 14:28:14 +0100 ++ ++courier-authlib (0.63.0-1) unstable; urgency=low ++ ++ * new upstream release ++ * fix deprecated dependency on libmysqlclient15off (Closes: #574101, ++ thanks to Dominik Röttsches for the report) ++ ++ -- Stefan Hornburg (Racke) Tue, 16 Mar 2010 16:14:44 +0100 ++ ++courier-authlib (0.62.4-1) unstable; urgency=low ++ ++ * new upstream release ++ - satisfies courier-base reverse dependency (Closes: #558120, ++ thanks to Julien Pinon for the report) ++ * fix incorrect handling of init.d reload action by removing it ++ (Closes: #527972, thanks to Peter Eisentraut ) ++ * use upstream config.* files ++ * lintian fixes ++ - added ${misc:Depends} for all packages ++ - eliminated commands with absolute paths in maintainer scripts ++ - bumped up Standards-Version ++ - bumped up debhelper comptability level to 5 ++ ++ -- Stefan Hornburg (Racke) Thu, 26 Nov 2009 20:09:13 +0100 ++ ++courier-authlib (0.62.2-1) unstable; urgency=low ++ ++ * new upstream release ++ * create run directory with init script (Closes: #349830, thanks to Tim ++ Small for the help) ++ * lintian ++ - copyright notice added to copyright ++ - overrides for file permission of configuration files ++ - reorder debhelper commands ++ ++ -- Stefan Hornburg (Racke) Mon, 02 Mar 2009 16:09:05 +0100 ++ +courier-authlib (0.61.0-1+lenny1) testing-security; urgency=high + + * Non-maintainer upload by the security team + * Fix several sql-injection vulnerabilities in authpgsqllib.c by using + PQsetClientEncoding() and PQescapeStringConn() + Fixes: CVE-2008-2380 + + -- Steffen Joeris Mon, 08 Dec 2008 13:48:12 +0000 + +courier-authlib (0.61.0-1) unstable; urgency=low + + * new upstream release + * lintian: + - debian/compat file + - don't ignore make clean errors + + -- Stefan Hornburg (Racke) Thu, 17 Jul 2008 12:59:36 +0200 + +courier-authlib (0.60.1-2.1) unstable; urgency=high + + * Non-maintainer upload by the security team + * Fix sql injection vulnerability by changing to use + mysql_set_character_set instead of SET NAMES + (Change was introduced by upstream in 0.60.6) + (Closes: #485424) + + -- Steffen Joeris Mon, 09 Jun 2008 15:29:23 +0000 + +courier-authlib (0.60.1-2) unstable; urgency=low + + * added LSB dependency info to init scripts (Closes: #460221, thanks to + Petter Reinholdtsen for the patch) + + -- Stefan Hornburg (Racke) Mon, 7 Apr 2008 13:21:37 +0200 + +courier-authlib (0.60.1-1) unstable; urgency=low + + * new upstream release + + -- Stefan Hornburg (Racke) Mon, 15 Oct 2007 10:56:16 +0200 + +courier-authlib (0.60.0-1) unstable; urgency=low + + * new upstream release, now under GPL version 3 + + -- Stefan Hornburg (Racke) Sun, 30 Sep 2007 21:58:35 +0200 + +courier-authlib (0.59.3-2) unstable; urgency=low + + * dropped alternative build dependency on postgresql-dev + (Closes: #429964, thanks to Lior Kaplan for the report + + -- Stefan Hornburg (Racke) Thu, 21 Jun 2007 20:26:38 +0200 + +courier-authlib (0.59.3-1) unstable; urgency=low + + * new upstream release + + -- Stefan Hornburg (Racke) Mon, 23 Apr 2007 10:18:17 +0200 + +courier-authlib (0.59.1-0.1) experimental; urgency=low + + * new upstream release + + -- Stefan Hornburg (Racke) Wed, 17 Jan 2007 11:58:29 +0100 + +courier-authlib (0.58-5) unstable; urgency=low + + * added dependency and build dependency on expect (Closes: #400812, + thanks to Peter Troeger for the report) + + -- Stefan Hornburg (Racke) Wed, 29 Nov 2006 11:42:45 +0100 + +courier-authlib (0.58-4) unstable; urgency=medium + + * call dh_makeshlibs during binary-arch target in order to get proper shlib + information for libcourierauth.so (Closes: #378249, thanks to Charles + Fry for the report and Steinar H. Gunderson + for the patch) + * ensure that courier-authdaemon is upgraded when switching to courier-authlib + * switch to lsb logging functions (Closes: #384823, thanks to David Härdeman + for the patch) + + -- Stefan Hornburg (Racke) Sat, 9 Sep 2006 17:37:11 +0200 + +courier-authlib (0.58-3.1) unstable; urgency=medium + + * Non-Maintainer Upload to fix security bug, caused by + /var/run/courier/authdaemon being world executable. Thanks to Martin + Ferrari for the fix. (Closes: #378571) + + -- Margarita Manterola Tue, 1 Aug 2006 16:45:07 -0300 + +courier-authlib (0.58-3) unstable; urgency=low + + * remove all Courier runtime files on purge of courier-authdaemon + + -- Stefan Hornburg (Racke) Tue, 6 Jun 2006 04:48:20 +0200 + +courier-authlib (0.58-2) unstable; urgency=low + + * set ownership of /var/run/courier and /var/run/courier/authdaemon to + daemon.daemon (Closes: #368358, #368360) + + -- Stefan Hornburg (Racke) Tue, 23 May 2006 09:43:15 +0200 + +courier-authlib (0.58-1.0) unstable; urgency=low + + * first upload to unstable + + -- Stefan Hornburg (Racke) Fri, 12 May 2006 16:53:38 +0200 + +courier-authlib (0.58-0.4) experimental; urgency=low + + * changed alternative dependency for libmysqlclient-dev to + libmysqlclient15-dev (Closes: #356728, thanks to Stefan Huehner + for the report) + + -- Stefan Hornburg (Racke) Tue, 14 Mar 2006 11:14:11 +0100 + +courier-authlib (0.58-0.3) experimental; urgency=low + + * courier-authlib-userdb conflicts with pre-authlib courier-base package + + -- Stefan Hornburg (Racke) Wed, 11 Jan 2006 09:33:10 +0100 + +courier-authlib (0.58-0.2) experimental; urgency=low + + * updated config.{guess,sub} to avoid FTBFS on some architectures + (Closes: #346105, thanks to Petr Salinger + ) + + -- Stefan Hornburg (Racke) Fri, 6 Jan 2006 11:13:19 +0100 + +courier-authlib (0.58-0.1) experimental; urgency=low + + * new upstream release + * transition to new PostgreSQL architecture (Closes: #339297, thanks to + Martin Pitt for the report and the patch) + * added courier-authlib-mysql/postgresql prerm/postinst scripts to + restart courier-authdaemon + + -- Stefan Hornburg (Racke) Thu, 5 Jan 2006 14:58:19 +0100 + +courier-authlib (0.57.20051004-2) experimental; urgency=low + + * ship configuration files with sane ownership/permissions + * restoring call to pam_acct_mgmt + + -- Stefan Hornburg (Racke) Fri, 11 Nov 2005 00:49:19 +0100 + +courier-authlib (0.57.20051004-1) experimental; urgency=low + + * new upstream release: + - contains authtest manual page and authpasswd script + * keep authtest name instead of renaming to courierauthtest, there are + currently no conflicts with other binaries + * separate package courier-authlib-pipe for authpipe module + * revive courier-authdaemon package to allow seamless upgrades from sarge + * changed FSF address in copyright file + * changed BuildDepends from libmysqlclient10-dev to libmysqlclient14-dev + * use DH_COMPAT=4 + + -- Stefan Hornburg (Racke) Tue, 25 Oct 2005 11:04:45 +0200 + +courier-authlib (0.56-0.5) experimental; urgency=low + + * added build dependency on procps (Closes: #311976, thanks to Kurt + Roeckx for the report) + + -- Stefan Hornburg (Racke) Sat, 4 Jun 2005 22:03:43 +0200 + +courier-authlib (0.56-0.4) experimental; urgency=low + + * provide proper LDAP configuration file instead of an empty one (thanks + to Peter Mann for the report) + + -- Stefan Hornburg (Racke) Tue, 31 May 2005 14:48:04 +0200 + +courier-authlib (0.56-0.3) experimental; urgency=low + + * added dependency to courier-authlib-dev on courier-authlib + * versioned dependencies for courier-authlib-* packages + + -- Stefan Hornburg (Racke) Tue, 31 May 2005 11:13:01 +0200 + +courier-authlib (0.56-0.2) experimental; urgency=low + + * removed check for openssl binary (Closes: #311175, thanks to Kenshi + Muto for the report) + + -- Stefan Hornburg (Racke) Mon, 30 May 2005 13:23:02 +0200 + +courier-authlib (0.56-0.1) experimental; urgency=low + + * initial release + + -- Stefan Hornburg (Racke) Fri, 27 May 2005 23:20:21 +0200 + diff --cc debian/compat index b8626c4,0000000..7ed6ff8 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 4 ++5 diff --cc debian/control index d7a1d2e,0000000..0e20a2f mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,69 -1,0 +1,69 @@@ +Source: courier-authlib +Section: mail +Priority: optional +Maintainer: Stefan Hornburg (Racke) - Standards-Version: 3.6.1.1 - Build-Depends: libmysqlclient-dev | libmysqlclient15-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, debhelper (>= 4.1.16), libldap-dev, libsasl2-dev | libsasl-dev, libpq-dev, libtool, libltdl3-dev, procps, expect ++Standards-Version: 3.8.3 ++Build-Depends: libmysqlclient-dev, libpam0g-dev, libgdbm-dev | libgdbmg1-dev, debhelper (>= 5.0.42), libldap-dev, libsasl2-dev | libsasl-dev, libpq-dev, libtool, libltdl3-dev, procps, expect + +Package: courier-authlib +Architecture: any - Depends: ${shlibs:Depends}, expect ++Depends: ${misc:Depends}, ${shlibs:Depends}, expect +Conflicts: courier-base (<< 0.48), courier-authdaemon (<< 0.58), courier-authmysql, courier-authpostgresql +Description: Courier authentication library + The Courier authentication library provides authentication services for + other Courier applications. + +Package: courier-authdaemon +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}), lsb-base (>= 3.0-10) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}), lsb-base (>= 3.0-10) +Description: Courier authentication daemon + This package contains the authentication daemon for the Courier applications. + +Package: courier-authlib-dev +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Conflicts: courier-base (<< 0.48) +Description: Development libraries for the Courier authentication library + This package contains the development libraries and files needed to compile + Courier packages that use the Courier authentication library. + +Package: courier-authlib-userdb +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Conflicts: courier-base (<< 0.48) +Description: userdb support for the Courier authentication library + This package contains the userdb support for the Courier authentication + library. Userdb is a simple way to manage virtual mail accounts using + a GDBM-based database file. + +Package: courier-authlib-mysql +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Conflicts: courier-authmysql +Replaces: courier-authmysql +Description: MySQL support for the Courier authentication library + This package contains the MySQL support for the Courier authentication library. + +Package: courier-authlib-postgresql +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Conflicts: courier-authpostgresql +Replaces: courier-authpostgresql +Description: PostgreSQL support for the Courier authentication library + This package contains the PostgreSQL support for the Courier authentication + library. + +Package: courier-authlib-ldap +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Description: LDAP support for the Courier authentication library + This package contains the LDAP support for the Courier authentication library. + +Package: courier-authlib-pipe +Architecture: any - Depends: ${shlibs:Depends}, courier-authlib (>= ${RELUP}) ++Depends: ${misc:Depends}, ${shlibs:Depends}, courier-authlib (>= ${RELUP}) +Description: External authentication support for the Courier authentication library + This package contains external authentication support via pipes for the + Courier authentication library. The authpipe module is a generic plugin + that enables authentication requests to be serviced by an external + program, then communicates through messages on stdin and stdout. diff --cc debian/copyright index a32c3fe,0000000..d7a6855 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,26 -1,0 +1,28 @@@ +This package was debianized by Stefan Hornburg (Racke) on +Fri Oct 29 10:59:13 2004 CEST. + +It was downloaded from: +ftp://courier.sourceforge.net/pub/courier/courier/ + +Upstream Author: + +Sam Varshavchik +Double Precision, Inc. +PO Box 668 +Greenwood Lake, NY 10925 + +Copyright: + ++Copyright 2004 - 2009 Double Precision, Inc. ++ +This software is released under the GPL, version 3. +Additionally, compiling, linking, and/or using the OpenSSL toolkit in +conjunction with this software is allowed. + +A copy of the GNU General Public License is available as +/usr/share/common-licenses/GPL-3 in the Debian GNU/Linux distribution or on the +World Wide Web at http://www.gnu.org/copyleft/gpl.html. You can also +obtain it by writing to the Free Software Foundation, Inc., 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + + diff --cc debian/courier-authdaemon.dirs index 5273027,0000000..8b13789 mode 100644,000000..100644 --- a/debian/courier-authdaemon.dirs +++ b/debian/courier-authdaemon.dirs @@@ -1,1 -1,0 +1,1 @@@ - /var/run/courier/authdaemon ++ diff --cc debian/courier-authdaemon.files index d7ec46c,0000000..708d183 mode 100644,000000..100644 --- a/debian/courier-authdaemon.files +++ b/debian/courier-authdaemon.files @@@ -1,3 -1,0 +1,4 @@@ +/etc/courier/authdaemonrc +/usr/sbin/authdaemond ++/usr/share/lintian/overrides/courier-authdaemon +/var/run/courier/authdaemon diff --cc debian/courier-authdaemon.init index b3da04e,0000000..521624b mode 100644,000000..100644 --- a/debian/courier-authdaemon.init +++ b/debian/courier-authdaemon.init @@@ -1,48 -1,0 +1,66 @@@ +#! /bin/sh -e +# +### BEGIN INIT INFO +# Provides: courier-authdaemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +prefix="/usr" +exec_prefix=${prefix} +sysconfdir="/etc/courier" +sbindir="${exec_prefix}/sbin" +daemonscript="${sbindir}/authdaemond" ++rundir_courier="/var/run/courier" ++rundir="/var/run/courier/authdaemon" ++pidfile="${rundir}/pid" + +. /lib/lsb/init-functions + +# Check for a leftover init script +if [ ! -x $daemonscript ]; then + exit 0 +fi + +case "$1" in +start) + # Start daemon. + cd / + log_daemon_msg "Starting Courier authentication services" "authdaemond" ++ if [ ! -d "$rundir_courier" ]; then ++ mkdir -m 0775 $rundir_courier ++ chown daemon:daemon $rundir_courier ++ # set file context for SELinux (#668564) ++ [ -x /sbin/restorecon ] && /sbin/restorecon $rundir_courier ++ fi ++ if [ ! -d "$rundir" ]; then ++ mkdir -m 0750 $rundir ++ chown daemon:daemon $rundir ++ # set file context for SELinux (#668564) ++ [ -x /sbin/restorecon ] && /sbin/restorecon $rundir ++ fi + $daemonscript start + log_end_msg 0 + ;; +stop) + # Stop daemon. + cd / + log_daemon_msg "Stopping Courier authentication services" "authdaemond" + $daemonscript stop + log_end_msg 0 + ;; - restart|reload|force-reload) ++restart|force-reload) + $0 stop + $0 start + ;; ++status) ++ status_of_proc -p "$pidfile" "" "authdaemond" && exit 0 || exit $? ++ ;; +*) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 ++ echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2 + exit 2 + ;; +esac +exit 0 diff --cc debian/courier-authdaemon.lintian index 0000000,0000000..cd2ce5a new file mode 100644 --- /dev/null +++ b/debian/courier-authdaemon.lintian @@@ -1,0 -1,0 +1,1 @@@ ++courier-authdaemon: non-standard-file-perm etc/courier/authdaemonrc 0660 != 0644 diff --cc debian/courier-authlib-ldap.files index 16b7437,0000000..fd1b632 mode 100644,000000..100644 --- a/debian/courier-authlib-ldap.files +++ b/debian/courier-authlib-ldap.files @@@ -1,2 -1,0 +1,3 @@@ +/etc/courier/authldaprc - /usr/lib/courier-authlib/libauthldap.so* ++/usr/lib/courier-authlib/libauthldap.so* ++/usr/share/lintian/overrides/courier-authlib-ldap diff --cc debian/courier-authlib-ldap.lintian index 0000000,0000000..35609f1 new file mode 100644 --- /dev/null +++ b/debian/courier-authlib-ldap.lintian @@@ -1,0 -1,0 +1,1 @@@ ++courier-authlib-ldap: non-standard-file-perm etc/courier/authldaprc 0660 != 0644 diff --cc debian/courier-authlib-mysql.files index fd92f24,0000000..6d0710c mode 100644,000000..100644 --- a/debian/courier-authlib-mysql.files +++ b/debian/courier-authlib-mysql.files @@@ -1,2 -1,0 +1,3 @@@ +/etc/courier/authmysqlrc - /usr/lib/courier-authlib/libauthmysql.so* ++/usr/lib/courier-authlib/libauthmysql.so* ++/usr/share/lintian/overrides/courier-authlib-mysql diff --cc debian/courier-authlib-mysql.lintian index 0000000,0000000..694ef48 new file mode 100644 --- /dev/null +++ b/debian/courier-authlib-mysql.lintian @@@ -1,0 -1,0 +1,1 @@@ ++courier-authlib-mysql: non-standard-file-perm etc/courier/authmysqlrc 0660 != 0644 diff --cc debian/courier-authlib-mysql.postinst index 207d93b,0000000..3903e3c mode 100644,000000..100644 --- a/debian/courier-authlib-mysql.postinst +++ b/debian/courier-authlib-mysql.postinst @@@ -1,30 -1,0 +1,30 @@@ +#! /bin/sh -e +# - # Copyright 2000,2001,2005 by Stefan Hornburg (Racke) ++# Copyright 2000,2001,2005,2009 by Stefan Hornburg (Racke) +# +# This program 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 program 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + + +if [ "$1" = "configure" ]; then + if [ -z "$2" ]; then + # initial install of authmysql, we need to restart authdaemon - if [ -x /usr/sbin/authdaemond ]; then - /usr/sbin/authdaemond restart ++ if which authdaemond >/dev/null 2>&1; then ++ authdaemond restart + fi + fi +fi + +#DEBHELPER# diff --cc debian/courier-authlib-mysql.prerm index 10a9ef2,0000000..b1e91c5 mode 100644,000000..100644 --- a/debian/courier-authlib-mysql.prerm +++ b/debian/courier-authlib-mysql.prerm @@@ -1,25 -1,0 +1,25 @@@ +#! /bin/sh -e +# - # Copyright 2000,2005 by Stefan Hornburg ++# Copyright 2000,2005,2009 by Stefan Hornburg +# +# This program 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 program 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + +# we need to restart authdaemon - if [ -x /usr/sbin/authdaemond ]; then - /usr/sbin/authdaemond restart ++if which authdaemond >/dev/null 2>&1; then ++ authdaemond restart +fi + +#DEBHELPER# diff --cc debian/courier-authlib-postgresql.files index 5387e8d,0000000..c99544a mode 100644,000000..100644 --- a/debian/courier-authlib-postgresql.files +++ b/debian/courier-authlib-postgresql.files @@@ -1,2 -1,0 +1,3 @@@ +/etc/courier/authpgsqlrc +/usr/lib/courier-authlib/libauthpgsql.so* ++/usr/share/lintian/overrides/courier-authlib-postgresql diff --cc debian/courier-authlib-postgresql.lintian index 0000000,0000000..5efd14e new file mode 100644 --- /dev/null +++ b/debian/courier-authlib-postgresql.lintian @@@ -1,0 -1,0 +1,1 @@@ ++courier-authlib-postgresql: non-standard-file-perm etc/courier/authpgsqlrc 0660 != 0644 diff --cc debian/courier-authlib-postgresql.postinst index 5de5e6c,0000000..2684740 mode 100644,000000..100644 --- a/debian/courier-authlib-postgresql.postinst +++ b/debian/courier-authlib-postgresql.postinst @@@ -1,30 -1,0 +1,30 @@@ +#! /bin/sh -e +# - # Copyright 2001,2005 by Stefan Hornburg (Racke) ++# Copyright 2001,2005,2009 by Stefan Hornburg (Racke) +# +# This program 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 program 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + + +if [ "$1" = "configure" ]; then + if [ -z "$2" ]; then + # initial install of authpostgresql, we need to restart authdaemon - if [ -x /usr/sbin/authdaemond ]; then - /usr/sbin/authdaemond restart ++ if which authdaemond >/dev/null 2>&1; then ++ authdaemond restart + fi + fi +fi + +#DEBHELPER# diff --cc debian/courier-authlib-postgresql.prerm index 31c83ba,0000000..b1e91c5 mode 100644,000000..100644 --- a/debian/courier-authlib-postgresql.prerm +++ b/debian/courier-authlib-postgresql.prerm @@@ -1,25 -1,0 +1,25 @@@ +#! /bin/sh -e +# - # Copyright 2001,2005 by Stefan Hornburg ++# Copyright 2000,2005,2009 by Stefan Hornburg +# +# This program 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 program 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + +# we need to restart authdaemon - if [ -x /usr/sbin/authdaemond ]; then - /usr/sbin/authdaemond restart ++if which authdaemond >/dev/null 2>&1; then ++ authdaemond restart +fi + +#DEBHELPER# diff --cc debian/courier-authlib.symbols index 0000000,0000000..6443838 new file mode 100644 --- /dev/null +++ b/debian/courier-authlib.symbols @@@ -1,0 -1,0 +1,116 @@@ ++libcourierauth.so courier-authlib #MINVER# ++* Build-Depends-Package: courier-authlib-dev ++ _auth_enumerate@Base 0.63.0 ++ _authdaemondo@Base 0.63.0 ++ _authdaemondopasswd@Base 0.63.0 ++ auth_callback_default@Base 0.63.0 ++ auth_daemon_cleanup@Base 0.63.0 ++ auth_enumerate@Base 0.63.0 ++ auth_generic@Base 0.63.0 ++ auth_getoption@Base 0.63.0 ++ auth_getoptionenv@Base 0.63.0 ++ auth_getoptionenvint@Base 0.63.0 ++ auth_getuserinfo@Base 0.63.0 ++ auth_login@Base 0.63.0 ++ auth_passwd@Base 0.63.0 ++ authdaemondo@Base 0.63.0 ++ authdaemondopasswd@Base 0.63.0 ++ courier_auth_err@Base 0.63.0 ++ courier_authdebug_authinfo@Base 0.63.0 ++ courier_authdebug_login@Base 0.63.0 ++ courier_authdebug_login_init@Base 0.63.0 ++ courier_authdebug_login_level@Base 0.63.0 ++ courier_authdebug_printf@Base 0.63.0 ++ courier_safe_printf@Base 0.63.0 ++ hmac_hashkey@Base 0.63.0 ++ hmac_hashtext@Base 0.63.0 ++ hmac_list@Base 0.63.0 ++ hmac_md5@Base 0.63.0 ++ hmac_sha1@Base 0.63.0 ++ hmac_sha256@Base 0.63.0 ++ libmail_atogid_t@Base 0.63.0 ++ libmail_atotime_t@Base 0.63.0 ++ libmail_atouid_t@Base 0.63.0 ++ libmail_changegroup@Base 0.63.0 ++ libmail_changeuidgid@Base 0.63.0 ++ libmail_changeusername@Base 0.63.0 ++ libmail_encode@Base 0.63.0 ++ libmail_encode_end@Base 0.63.0 ++ libmail_encode_start@Base 0.63.0 ++ libmail_str_dev_t@Base 0.63.0 ++ libmail_str_gid_t@Base 0.63.0 ++ libmail_str_ino_t@Base 0.63.0 ++ libmail_str_off_t@Base 0.63.0 ++ libmail_str_pid_t@Base 0.63.0 ++ libmail_str_size_t@Base 0.63.0 ++ libmail_str_sizekb@Base 0.63.0 ++ libmail_str_time_t@Base 0.63.0 ++ libmail_str_uid_t@Base 0.63.0 ++ libmail_strh_dev_t@Base 0.63.0 ++ libmail_strh_ino_t@Base 0.63.0 ++ libmail_strh_pid_t@Base 0.63.0 ++ libmail_strh_time_t@Base 0.63.0 ++ libmail_strtogid_t@Base 0.63.0 ++ libmail_strtotime_t@Base 0.63.0 ++ libmail_strtouid_t@Base 0.63.0 ++ md5_context_digest@Base 0.63.0 ++ md5_context_endstream@Base 0.63.0 ++ md5_context_hash@Base 0.63.0 ++ md5_context_hashstream@Base 0.63.0 ++ md5_context_init@Base 0.63.0 ++ md5_context_restore@Base 0.63.0 ++ md5_crypt_redhat@Base 0.63.0 ++ md5_digest@Base 0.63.0 ++ md5_hash_courier@Base 0.63.0 ++ md5_hash_raw@Base 0.63.0 ++ random128@Base 0.63.0 ++ random128_alpha@Base 0.63.0 ++ random128_binary@Base 0.63.0 ++ sha1_context_digest@Base 0.63.0 ++ sha1_context_endstream@Base 0.63.0 ++ sha1_context_hash@Base 0.63.0 ++ sha1_context_hashstream@Base 0.63.0 ++ sha1_context_init@Base 0.63.0 ++ sha1_context_restore@Base 0.63.0 ++ sha1_digest@Base 0.63.0 ++ sha1_hash@Base 0.63.0 ++ sha256_context_digest@Base 0.63.0 ++ sha256_context_endstream@Base 0.63.0 ++ sha256_context_hash@Base 0.63.0 ++ sha256_context_hashstream@Base 0.63.0 ++ sha256_context_init@Base 0.63.0 ++ sha256_context_restore@Base 0.63.0 ++ sha256_digest@Base 0.63.0 ++ sha256_hash@Base 0.63.0 ++ sha512_context_digest@Base 0.63.0 ++ sha512_context_endstream@Base 0.63.0 ++ sha512_context_hash@Base 0.63.0 ++ sha512_context_hashstream@Base 0.63.0 ++ sha512_context_init@Base 0.63.0 ++ sha512_context_restore@Base 0.63.0 ++ sha512_digest@Base 0.63.0 ++ sha512_hash@Base 0.63.0 ++ ssha_hash@Base 0.63.0 ++ strdupdefdomain@Base 0.63.0 ++libcourierauthcommon.so courier-authlib #MINVER# ++* Build-Depends-Package: courier-authlib-dev ++ auth_cram_callback@Base 0.63.0 ++ auth_get_cram@Base 0.63.0 ++ auth_pwd_enumerate@Base 0.63.0 ++ auth_sys_common@Base 0.63.0 ++ auth_syspasswd@Base 0.63.0 ++ auth_verify_cram@Base 0.63.0 ++ authcheckpassword@Base 0.63.0 ++ authcheckpasswordmd5@Base 0.63.0 ++ authcheckpasswordsha1@Base 0.63.0 ++ authcryptpasswd@Base 0.63.0 ++ authsasl_frombase64@Base 0.63.0 ++ authsasl_tobase64@Base 0.63.0 ++ courier_auth_ldap_escape@Base 0.63.0 ++libcourierauthsasl.so courier-authlib #MINVER# ++* Build-Depends-Package: courier-authlib-dev ++ auth_sasl@Base 0.63.0 ++ auth_sasl_ex@Base 0.63.0 ++libcourierauthsaslclient.so courier-authlib #MINVER# ++* Build-Depends-Package: courier-authlib-dev ++ auth_sasl_client@Base 0.63.0 diff --cc debian/rules index 2a13678,0000000..e14ab47 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,191 -1,0 +1,204 @@@ +#!/usr/bin/make -f +# +# Copyright 2004,2005,2008 by Stefan Hornburg (Racke) +# +# This program 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 program 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + +BUILD=$(shell pwd)/debian/tmp +RELUP=$(shell dpkg-parsechangelog | perl -ne 'print $$1 if /^Version: (.*?)-(.*)$$/') + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# Common configuration options +NONSSL_CONFOPTS=--without-certdb --without-authpgsql + ++CFLAGS = `dpkg-buildflags --get CFLAGS` ++LDFLAGS = `dpkg-buildflags --get LDFLAGS` ++LDFLAGS += -lcrypt ++CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` ++ +COMMON_CONFOPTS=--prefix=/usr --mandir=\$${prefix}/share/man \ + --with-authdaemonvar=/var/run/courier/authdaemon \ ++ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + --sysconfdir=/etc/courier \ + --with-pkgconfdir=/etc/courier \ + --libexecdir=\$${prefix}/lib/courier \ + --datadir=\$${prefix}/lib/courier \ + --localstatedir=/var/lib/courier \ + --sbindir=\$${exec_prefix}/sbin \ + --with-mailuser=daemon \ + --with-mailgroup=daemon \ + --without-socks \ + --with-authpam \ + --with-authpipe \ + --without-authpwd \ + --with-authmysql \ + --with-mysql-includes=/usr/include/mysql \ + --with-mysql-libs=/usr/lib \ + --with-authmysqlrc=/etc/courier/authmysqlrc \ + --with-authpgsql \ + --with-pgsql-includes=`pg_config --includedir` \ + --with-pgsql-libs=/usr/lib \ + --with-authpgsqlrc=/etc/courier/authpgsqlrc \ + --without-authshadow \ + --with-authdaemonvar=/var/run/courier/authdaemon \ + --with-authldap \ + --with-authldaprc=/etc/courier/authldaprc \ + --with-authcram \ + --with-db=gdbm \ + --without-fcgi \ + --with-htmllibdir=/usr/share/sqwebmail \ + --with-ispell=/usr/bin/ispell \ + --enable-userdb \ + --enable-syslog=1 \ + --disable-root-check + +check: + dh_testdir - - # check umask - if [ `umask` != "0022" ]; then echo "You need to set umask to 022 in order to compile/build courier"; exit 1; fi + chmod +x debian/courier_perms + +build: check +# create a list of files that currently exists + if [ ! -f stamp-build ]; then \ + if [ -d /usr/include/postgresql/8.0/libpq_fe.h ]; then \ - LDFLAGS=-lcrypt ./configure $(COMMON_CONFOPTS) \ ++ ./configure $(COMMON_CONFOPTS) \ + --with-postgresql-includes=/usr/include/postgresql/8.0 \ + && $(MAKE) && touch stamp-build; \ + else \ - LDFLAGS=-lcrypt ./configure $(COMMON_CONFOPTS) \ ++ ./configure $(COMMON_CONFOPTS) \ + --with-postgresql-includes=/usr/include/postgresql \ + && $(MAKE) && touch stamp-build; \ + fi \ + fi + +stamp-build: build + +clean: check + dh_testroot + rm -f stamp-build stamp-install + +# Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) clean ++ [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: check stamp-build + dh_testroot + dh_clean -k + dh_installdirs + +# Add here commands to install the package into debian/tmp. - $(MAKE) DESTDIR=$(BUILD) install ++ $(MAKE) DESTDIR=$(BUILD) install ++ ++ sed -i "/dependency_libs/ s/'.*'/''/" `find $(BUILD) -name '*.la'` + +# (cd $(BUILD)/usr/lib/courier/courier-authlib/changepwd; ln -fs ../../authsystem.passwd ./authsystem.passwd) + +# Install authentification test program +# mv $(BUILD)/usr/sbin/authtest $(BUILD)/usr/sbin/courierauthtest + +# Additional manpages + pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/authenumerate.pod > $(BUILD)/usr/share/man/man8/authenumerate.8 +# pod2man --center='Debian GNU/Linux Documentation' --release='Debian GNU/Linux '`cat /etc/debian_version` --section=8 debian/courierauthtest.pod > $(BUILD)/usr/share/man/man8/courierauthtest.8 + +# Symlinks for userdb manpages + (cd $(BUILD)/usr/share/man/man8 && ln -s makeuserdb.8.gz pw2userdb.8.gz) + + dh_installdocs +# - change authentification default settings + perl -pe 's/^authmodulelist=".*?"/authmodulelist="authpam"/' $(BUILD)/etc/courier/authdaemonrc.dist > $(BUILD)/etc/courier/authdaemonrc +# - change default LDAP server + perl -pe 's/^(LDAP_SERVER\s+)ldap.example.com/$$1localhost/' $(BUILD)/etc/courier/authldaprc.dist > $(BUILD)/etc/courier/authldaprc +# - change default MySQL server + perl -pe 's/^(MYSQL_SERVER\s+)mysql.example.com/$$1localhost/;s%^(#?\s*MYSQL_SOCKET\s+)/.*%$$1/var/run/mysqld/mysqld.sock%' $(BUILD)/etc/courier/authmysqlrc.dist > $(BUILD)/etc/courier/authmysqlrc + mv $(BUILD)/etc/courier/authpgsqlrc.dist $(BUILD)/etc/courier/authpgsqlrc + rm $(BUILD)/etc/courier/*.dist + ++# Lintian overrides ++ mkdir -p $(BUILD)/usr/share/lintian/overrides ++ for package in courier-authdaemon courier-authlib-ldap courier-authlib-mysql courier-authlib-postgresql; do \ ++ cp debian/$$package.lintian $(BUILD)/usr/share/lintian/overrides/$$package; \ ++ done ++ +# This seems to be necessary for building in fakeroot +# environment (otherwise dh_strip fails) +# set all binaries to 755, by checking if user has x-bit +# debian/courier_perms will set the right permissions + find $(BUILD) -perm -u+x -type f | xargs chmod u+rwx,go+rx + + dh_movefiles + +# Check if all files have moved out + if [ `find $(BUILD) -not -type d | wc -l` -ne 0 ]; then find $(BUILD) -not -type d; echo "File(s) found not belonging to any package, please contact maintainer"; exit 1; fi + + touch stamp-install + +stamp-install: install + +# Build architecture-independent files here. +binary-indep: stamp-build stamp-install + dh_testdir + dh_testroot +# dh_installdebconf -i + dh_installexamples -i + dh_installmenu -i + dh_installinit -i + dh_installinfo -i + dh_installchangelogs -i + dh_strip -i + dh_link -i + dh_compress -i + dh_fixperms -i + debian/courier_perms -i + dh_installdeb -i + dh_perl -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + ++calibdir = debian/courier-authlib/usr/lib/courier-authlib ++ +# Build architecture-dependent files here. +binary-arch: stamp-build stamp-install + dh_testdir + dh_testroot +# dh_installdebconf -a + dh_installexamples -a + dh_installmenu -a + dh_installinit -a + dh_installcron -a + dh_installinfo -a + dh_installchangelogs -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + debian/courier_perms -a - dh_installdeb -a + dh_perl -a - dh_makeshlibs -a - dh_shlibdeps -a ++ dh_makeshlibs -pcourier-authlib -- -Pdebian/courier-authlib -e$(calibdir)/libcourier*.so ++ dh_shlibdeps -a -l$(calibdir) ++ dh_installdeb -a + dh_gencontrol -- -VRELUP="$(RELUP)" + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch + +.PHONY: check build clean binary-arch binary install