From 53d0425986f2d5fc9d2ce3fad54a0a3030303959 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Wed, 27 Dec 2006 11:37:46 +0000 Subject: [PATCH] * purged existance of the unixlogin package, as we decide that in the postinst progress of citadel-server. --- citadel/debian/citadel-server.install | 2 + citadel/debian/citadel-server.postinst | 2 + citadel/debian/citadel-server.substvars | 2 +- citadel/debian/citadel-unixlogin.install | 2 - citadel/debian/citadel-unixlogin.postinst | 61 ---------------------- citadel/debian/citadel-unixlogin.substvars | 1 - 6 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 citadel/debian/citadel-unixlogin.install delete mode 100644 citadel/debian/citadel-unixlogin.postinst delete mode 100644 citadel/debian/citadel-unixlogin.substvars diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index a841cbd85..87a82b32d 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -7,3 +7,5 @@ debian/tmp/usr/sbin/sendcommand debian/tmp/usr/sbin/base64 debian/tmp/usr/lib/citadel-server/setup debian/tmp/usr/lib/citadel-server/ctdlsvc +debian/tmp/usr/sbin/chkpwd + diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index d9cb9422b..51276284f 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -156,6 +156,8 @@ case "$1" in ### done! now we'll just clear up our cruft. #rm -f $tempfile + chown root:root /usr/sbin/chkpwd + chmod 4755 /usr/sbin/chkpwd db_get citadel/Administrator && admin="$RET" db_get citadel/ServerIPAddress && ip_addr="$RET" diff --git a/citadel/debian/citadel-server.substvars b/citadel/debian/citadel-server.substvars index 3c6c97283..8e416c9ca 100644 --- a/citadel/debian/citadel-server.substvars +++ b/citadel/debian/citadel-server.substvars @@ -1,2 +1,2 @@ misc:Depends=debconf (>= 0.5) | debconf-2.0 -shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libpam0g (>= 0.76), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1) diff --git a/citadel/debian/citadel-unixlogin.install b/citadel/debian/citadel-unixlogin.install deleted file mode 100644 index d9704f664..000000000 --- a/citadel/debian/citadel-unixlogin.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/sbin/chkpwd - diff --git a/citadel/debian/citadel-unixlogin.postinst b/citadel/debian/citadel-unixlogin.postinst deleted file mode 100644 index 7d5e2f54a..000000000 --- a/citadel/debian/citadel-unixlogin.postinst +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh -# postinst.skeleton -# Skeleton maintainer script showing all the possible cases. -# Written by Charles Briscoe-Smith, March-June 1998. Public Domain. - -# Abort if any command returns an error value -set -e - -# Use debconf. -. /usr/share/debconf/confmodule - -# This script is called as the last step of the installation of the -# package. All the package's files are in place, dpkg has already done -# its automatic conffile handling, and all the packages we depend of -# are already fully installed and configured. - -# The following idempotent stuff doesn't generally need protecting -# against being run in the abort-* cases. - - -case "$1" in - configure) - # Configure this package. If the package must prompt the user for - # information, do it here. - chown root:root /usr/sbin/chkpwd - chmod 4755 /usr/sbin/chkpwd - ;; - abort-upgrade) - # Back out of an attempt to upgrade this package FROM THIS VERSION - # to version $2. Undo the effects of "prerm upgrade $2". - #: - - ;; - abort-remove) - ###if test "$2" != in-favour; then - ### echo "$0: undocumented call to \`postinst $*'" 1>&2 - ### exit 0 - ###fi - #### Back out of an attempt to remove this package, which was due to - #### a conflict with package $3 (version $4). Undo the effects of - #### "prerm remove in-favour $3 $4". - ###: - - ;; - abort-deconfigure) - ###if test "$2" != in-favour -o "$5" != removing; then - ### echo "$0: undocumented call to \`postinst $*'" 1>&2 - ### exit 0 - ###fi - #### Back out of an attempt to deconfigure this package, which was - #### due to package $6 (version $7) which we depend on being removed - #### to make way for package $3 (version $4). Undo the effects of - #### "prerm deconfigure in-favour $3 $4 removing $6 $7". - ###: - - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -exit 0 diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars deleted file mode 100644 index 96d819b9f..000000000 --- a/citadel/debian/citadel-unixlogin.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.3.6-6), libpam0g (>= 0.76) -- 2.39.2