From 60566a945e58f4f067479a796bad3b06965fc1e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 21 Nov 2005 16:29:01 +0000 Subject: [PATCH] * add some script to wrap the debian package build that does some magic about the versioning in the package and the citadel system * Many fixups to the debian packages * added Unixlogin Package --- citadel/debian/changelog | 13 +++++++++ citadel/debian/citadel-client.substvars | 2 +- citadel/debian/citadel-mta.substvars | 2 +- citadel/debian/citadel-server.install | 1 - citadel/debian/citadel-server.postinst | 31 +++++++++++++++++----- citadel/debian/citadel-server.postrm | 13 +++++++-- citadel/debian/citadel-server.substvars | 2 +- citadel/debian/citadel-unixlogin.install | 2 ++ citadel/debian/citadel-unixlogin.substvars | 1 + citadel/debian/control | 6 +++++ citadel/debian/files | 4 --- citadel/debian/files_preview | 5 ++++ citadel/debian/rules | 11 ++++---- 13 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 citadel/debian/citadel-unixlogin.install create mode 100644 citadel/debian/citadel-unixlogin.substvars delete mode 100644 citadel/debian/files create mode 100644 citadel/debian/files_preview diff --git a/citadel/debian/changelog b/citadel/debian/changelog index f2d2e2ec3..04322668e 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,16 @@ +citadel (6.62-1) unstable; urgency=low + + * update to actual Citadel CVS. many new features. see Packages changelog. + + -- Wilfried Goesgens Fri, 18 Nov 2005 16:04:00 +0100 + + +citadel (6.61-2) unstable; urgency=low + + * update to actual Citadel CVS. many new features. see Packages changelog. + + -- Wilfried Goesgens Tue, 01 Nov 2005 12:23:15 +0200 + citadel (6.53-1) unstable; urgency=low * Initial release Closes: #nnnn (nnnn is the bug number of your ITP) diff --git a/citadel/debian/citadel-client.substvars b/citadel/debian/citadel-client.substvars index ee9fce249..104e19dc4 100644 --- a/citadel/debian/citadel-client.substvars +++ b/citadel/debian/citadel-client.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libncurses5 (>= 5.4-5), libssl0.9.7 +shlibs:Depends=libc6 (>= 2.3.5-1), libncurses5 (>= 5.4-5), libssl0.9.8 diff --git a/citadel/debian/citadel-mta.substvars b/citadel/debian/citadel-mta.substvars index ee9fce249..104e19dc4 100644 --- a/citadel/debian/citadel-mta.substvars +++ b/citadel/debian/citadel-mta.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libncurses5 (>= 5.4-5), libssl0.9.7 +shlibs:Depends=libc6 (>= 2.3.5-1), libncurses5 (>= 5.4-5), libssl0.9.8 diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index ae5ddc3fc..19c2b2c4c 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -1,5 +1,4 @@ debian/tmp/usr/sbin/citserver -debian/tmp/usr/sbin/chkpwd debian/tmp/usr/sbin/aidepost debian/tmp/usr/sbin/msgform debian/tmp/usr/sbin/citmail diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index fe8ce8888..55386c579 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -93,6 +93,7 @@ case "$1" in # /var/run/citadel # + mkdir -p /var/lib/citadel/help for i in aide floors hours intro.gz mail network nice.gz policy software summary.gz; do case $i in *.gz) @@ -112,6 +113,7 @@ case "$1" in # if test ! -e '/var/lib/citadel/help/?'; then # cp '/usr/share/doc/citadel/examples/data/help/?' '/var/lib/citadel/help' # fi + mkdir -p /var/lib/citadel/messages for i in aideopt changepw dotopt entermsg entopt goodbye hello help mainmenu newuser readopt register roomaccess unlisted; do ucf "/usr/share/doc/citadel-server/examples/messages/$i" "/var/lib/citadel/messages/$i" @@ -156,15 +158,30 @@ case "$1" in db_get citadel/Administrator && admin="$RET" db_get citadel/ServerIPAddress && ip_addr="$RET" + export CITADEL=/usr/sbin/ + export CITADEL_INSTALLER=yes + export ACT_AS_MTA=no + export SYSADMIN_NAME=$admin + export CREATE_XINETD_ENTRY=no + export CREATE_INITTAB_ENTRY=yes echo "applying your settings." - echo "/usr/sbin -$admin -citadel -$ip_addr - -" | \ +# citadel home +# sysadmin +# uid +# server ip +# port +# postfix? +# exim? +# echo "/usr/sbin +#$admin +#citadel +#$ip_addr +# +#no +#no +#" | \ /usr/lib/citadel-server/setup -q - + killall -HUP init #### There are three sub-cases: ###if test "${2+set}" != set; then ### # We're being installed by an ancient dpkg which doesn't remember diff --git a/citadel/debian/citadel-server.postrm b/citadel/debian/citadel-server.postrm index 661c9127a..18057f2de 100644 --- a/citadel/debian/citadel-server.postrm +++ b/citadel/debian/citadel-server.postrm @@ -2,6 +2,7 @@ # postrm.skeleton # Skeleton maintainer script showing all the possible cases. # Written by Charles Briscoe-Smith, March-June 1998. Public Domain. +. /usr/share/debconf/confmodule # Abort if any command returns an error value set -e @@ -18,7 +19,10 @@ case "$1" in remove) # This package is being removed, but its configuration has not yet # been purged. - + export CREATE_INITTAB_ENTRY=no + /usr/lib/citadel-server/setup -q + killall -HUP init + # Remove diversion #: dpkg-divert --package foo --remove --rename \ @@ -26,7 +30,7 @@ case "$1" in # ldconfig is NOT needed during removal of a library, only during # installation - + ;; purge) # This package has previously been removed and is now having @@ -37,11 +41,13 @@ case "$1" in ucf --purge "/var/lib/citadel/help/$i" rm -f "/var/lib/citadel/help/$i" done + rmdir "/var/lib/citadel/help" for i in aideopt changepw dotopt entermsg entopt goodbye hello help mainmenu newuser readopt register roomaccess unlisted; do ucf --purge "/var/lib/citadel/messages/$i" rm -f "/var/lib/citadel/messages/$i" done + rmdir "/var/lib/citadel/messages" for i in mail.aliases public_clients citadel.conf; do ucf --purge "/etc/citadel/$i" @@ -55,6 +61,9 @@ case "$1" in rm -f /var/lib/citadel/messages/*$ext rm -f /var/lib/citadel/help/*$ext done + echo "/var/lib/citadel/data not removed, as it may contain your personal data." + db_purge + db_go ### TODO: remove citadel from inittab! ;; disappear) diff --git a/citadel/debian/citadel-server.substvars b/citadel/debian/citadel-server.substvars index 037de70f0..babf500f7 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.2.ds1-21), libdb4.2, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libssl0.9.7, zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.3.5-1), libdb4.2, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libssl0.9.8, zlib1g (>= 1:1.2.1) diff --git a/citadel/debian/citadel-unixlogin.install b/citadel/debian/citadel-unixlogin.install new file mode 100644 index 000000000..d9704f664 --- /dev/null +++ b/citadel/debian/citadel-unixlogin.install @@ -0,0 +1,2 @@ +debian/tmp/usr/sbin/chkpwd + diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars new file mode 100644 index 000000000..937460727 --- /dev/null +++ b/citadel/debian/citadel-unixlogin.substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.5-1) diff --git a/citadel/debian/control b/citadel/debian/control index 850d6460e..6245d13d4 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -36,6 +36,12 @@ Description: This is the commandline-client to the citadel BBS system. software that helps them work, play, stay in touch... without calling attention to itself. +Package: citadel-unixlogin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: This enables your citadel server to sync its passwords with + unix system accounts. + Package: citadel-mta Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server diff --git a/citadel/debian/files b/citadel/debian/files deleted file mode 100644 index 4e57879e0..000000000 --- a/citadel/debian/files +++ /dev/null @@ -1,4 +0,0 @@ -citadel-server_6.53-1_i386.deb mail optional -citadel-client_6.53-1_i386.deb mail optional -citadel-mta_6.53-1_i386.deb mail optional -citadel-doc_6.53-1_all.deb mail optional diff --git a/citadel/debian/files_preview b/citadel/debian/files_preview new file mode 100644 index 000000000..8d70c9293 --- /dev/null +++ b/citadel/debian/files_preview @@ -0,0 +1,5 @@ +citadel-server_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional +citadel-client_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional +citadel-mta_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional +citadel-doc_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional +citadel-unixlogin_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional diff --git a/citadel/debian/rules b/citadel/debian/rules index a1826e715..9af35c279 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -24,11 +24,11 @@ export VERSION=`grep 'THIS IS' $(CURDIR)/ChangeLog |head -n 1 |sed "s;.* ;;"` CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 -ggdb +#else +# CFLAGS += -O2 +#endif config.status: configure dh_testdir @@ -41,6 +41,7 @@ config.status: configure --with-datadir=/var/lib/citadel \ --with-rundir=/var/run/citadel \ --with-docdir=/usr/share/doc/citadel-doc/ \ + --enable-autologin \ --with-ical --with-db --with-ldap -- 2.30.2