tags 279030 + patch
stop
I propose the attached patch to clear up the conflict between the
debconf settings and the conffile. I believe this follows the
consensus of the discussion so far. Unless there are overriding
concerns I plan to NMU this patch in the context of the bug-squashing
party over the weekend.
diff -u mldonkey-2.5.28/debian/control mldonkey-2.5.28/debian/control
--- mldonkey-2.5.28/debian/control
+++ mldonkey-2.5.28/debian/control
@@ -2,12 +2,12 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <[EMAIL PROTECTED]>
-Build-Depends: ocaml-nox-3.08, debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl, docbook-xml, chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev
+Build-Depends: ocaml-nox, debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl, docbook-xml, chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev
Standards-Version: 3.6.1.0
Package: mldonkey-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${interpreter:Depends}, adduser, mime-support, debconf (>= 0.2.26), ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${interpreter:Depends}, adduser, mime-support, debconf (>= 0.2.26)
Description: Door to the 'donkey' network
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
diff -u mldonkey-2.5.28/debian/changelog mldonkey-2.5.28/debian/changelog
--- mldonkey-2.5.28/debian/changelog
+++ mldonkey-2.5.28/debian/changelog
@@ -1,3 +1,16 @@
+mldonkey (2.5.28-2.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Change build dependency to ocaml-nox
+ * Remove debconf questions that interfere with the conffile
+ /etc/default/mldonkey. User and group are now fixed at "mldonkey",
+ directory is fixed at "/var/lib/mldonkey". No longer using ucf.
+ (closes: #279030, #277353)
+ * Fix typo in init script (closes: #273156, #296573)
+ * Add commonDownloads.ml to clean target
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Fri, 5 Aug 2005 00:43:22 +0200
+
mldonkey (2.5.28-2) unstable; urgency=medium
* Enhanced patch 18_utf8 ( should made mlgui works for people using UTF 8
diff -u mldonkey-2.5.28/debian/rules mldonkey-2.5.28/debian/rules
--- mldonkey-2.5.28/debian/rules
+++ mldonkey-2.5.28/debian/rules
@@ -97,6 +97,7 @@
-$(RM) .depend
-$(RM) packages/rpm/*.spec
-$(RM) packages/windows/mlnet.nsi
+ -$(RM) src/daemon/common/commonDownloads.ml
-$(RM) src/utils/lib/autoconf.ml
-$(RM) src/utils/lib/gAutoconf.ml
-$(RM) src/utils/lib/autoconf.ml.new
diff -u mldonkey-2.5.28/debian/mldonkey-server.dirs mldonkey-2.5.28/debian/mldonkey-server.dirs
--- mldonkey-2.5.28/debian/mldonkey-server.dirs
+++ mldonkey-2.5.28/debian/mldonkey-server.dirs
@@ -1,2 +1,3 @@
+var/lib/mldonkey
var/run/mldonkey
var/log/mldonkey
diff -u mldonkey-2.5.28/debian/mldonkey-server.config mldonkey-2.5.28/debian/mldonkey-server.config
--- mldonkey-2.5.28/debian/mldonkey-server.config
+++ mldonkey-2.5.28/debian/mldonkey-server.config
@@ -7,125 +7,26 @@
. /usr/share/debconf/confmodule
-CONFIGFILE=/etc/default/mldonkey-server
-if [ -e $CONFIGFILE ]
-then
- MLDONKEY_DIR=
- MLDONKEY_GROUP=
- MLDONKEY_UMASK=
- MAX_ALIVE=
- LAUNCH_AT_STARTUP=
- MLDONKEY_NICENESS=
- . $CONFIGFILE || true
-
- if [ "$MLDONKEY_DIR" != "" ]; then
- db_set mldonkey-server/mldonkey_dir $MLDONKEY_DIR
- fi
-
- if [ "$MLDONKEY_GROUP" != "" ]; then
- db_set mldonkey-server/mldonkey_group $MLDONKEY_GROUP
- fi
-
- if [ "$MLDONKEY_UMASK" != "" ]; then
- db_set mldonkey-server/mldonkey_umask $MLDONKEY_UMASK
- fi
-
- if [ "$MAX_ALIVE" != "" ]; then
- db_set mldonkey-server/max_alive $MAX_ALIVE
- fi
-
- if [ "$MLDONKEY_NICENESS" != "" ]; then
- db_set mldonkey-server/mldonkey_niceness $MLDONKEY_NICENESS
- fi
-
- if [ "$LAUNCH_AT_STARTUP" != "" ]; then
- if [ "$LAUNCH_AT_STARTUP" = "true" ]; then
- db_set mldonkey-server/launch_at_startup true
- else
- db_set mldonkey-server/launch_at_startup false
- fi
- fi
-fi
-
-if [ -x /usr/bin/mldonkey_options ] && [ -e $MLDONKEY_DIR/downloads.ini ]; then
- db_set mldonkey-server/client_name `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g client_name`
- db_set mldonkey-server/max_hard_upload_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_upload_rate`
- db_set mldonkey-server/max_hard_download_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_download_rate`
+if [ -x /usr/bin/mldonkey_options ] && [ -e /var/lib/mldonkey/downloads.ini ]; then
+ db_set mldonkey-server/client_name `/usr/bin/mldonkey_options -f /var/lib/mldonkey/downloads.ini -g client_name`
+ db_set mldonkey-server/max_hard_upload_rate `/usr/bin/mldonkey_options -f /var/lib/mldonkey/downloads.ini -g max_hard_upload_rate`
+ db_set mldonkey-server/max_hard_download_rate `/usr/bin/mldonkey_options -f /var/lib/mldonkey/downloads.ini -g max_hard_download_rate`
# BUG : We should also fetch the default plugin
fi
#db_version 2.0
-db_reset mldonkey-server/reown_file
-db_reset mldonkey-server/mldonkey_move
-
# If it is the first time we install : set a default hostname
-if [ ! -n "$MLDONKEY_DIR" ] || [ ! -d $MLDONKEY_DIR ] || [ ! -f $MLDONKEY_DIR/downloads.ini ]; then
+if [ ! -f /var/lib/mldonkey/downloads.ini ]; then
client_name=`/bin/hostname`
db_set mldonkey-server/client_name "$client_name"
fi
-# Do we start at startup
-db_input high mldonkey-server/launch_at_startup || true
-db_go
-
-#If yes, lets begin the conf
-db_get mldonkey-server/launch_at_startup
-launch_at_startup="$RET"
-
-if [ "$launch_at_startup" = "true" ]; then
-
db_input medium mldonkey-server/restart_after_upgrade || true
db_go
- db_input medium mldonkey-server/run_as_user || true
- db_go
-
- db_input medium mldonkey-server/mldonkey_group || true
- db_go
-
- # Existence and owner test
-
- if [ -f $MLDONKEY_DIR/downloads.ini ]; then
-
- owner=`/usr/bin/stat --format="%U %G" $MLDONKEY_DIR/downloads.ini`
-
- db_get mldonkey-server/run_as_user
- new_owner="$RET"
-
- db_get mldonkey-server/mldonkey_group
- new_owner="$new_owner $RET"
-
- if [ "$new_owner" != "$owner" ]; then
-
- db_input medium mldonkey-server/reown_file || true
- db_go
-
- fi
-
- fi
-
- db_input high mldonkey-server/mldonkey_dir || true
- db_go
-
# Existence test
- db_get mldonkey-server/mldonkey_dir
- NEW_MLDONKEY_DIR="$RET"
-
- if [ "$NEW_MLDONKEY_DIR" != "$MLDONKEY_DIR" ] && [ -f $MLDONKEY_DIR/downloads.ini ]; then
-
- db_input medium mldonkey-server/mldonkey_move || true
- db_go
-
- fi
-
- db_input high mldonkey-server/mldonkey_umask || true
- db_go
-
- db_input high mldonkey-server/mldonkey_niceness || true
- db_go
-
db_input high mldonkey-server/client_name || true
db_go
@@ -138,9 +39,6 @@
db_input medium mldonkey-server/max_hard_upload_rate || true
db_go
- db_input high mldonkey-server/max_alive || true
- db_go
-
password="a"
repassword="b"
@@ -170,3 +67,0 @@
-
-fi
-
diff -u mldonkey-2.5.28/debian/mldonkey-server.init mldonkey-2.5.28/debian/mldonkey-server.init
--- mldonkey-2.5.28/debian/mldonkey-server.init
+++ mldonkey-2.5.28/debian/mldonkey-server.init
@@ -17,6 +17,7 @@
DESC="MLDonkey"
CONFIG=/etc/default/mldonkey-server
PIDFILE=/var/run/mldonkey/$NAME.pid
+MLDONKEY_DIR=/var/lib/mldonkey
test -x $WRAPPER || exit 0
@@ -31,7 +32,7 @@
fi
if [ ! -d $MLDONKEY_DIR ]; then
- if [ -z "$MDLONKEY_DIR" ]; then
+ if [ -z "$MLDONKEY_DIR" ]; then
MLDONKEY_DIR="(unset)"
fi
echo "$MLDONKEY_DIR is not a valid directory"
diff -u mldonkey-2.5.28/debian/mldonkey-server.postinst mldonkey-2.5.28/debian/mldonkey-server.postinst
--- mldonkey-2.5.28/debian/mldonkey-server.postinst
+++ mldonkey-2.5.28/debian/mldonkey-server.postinst
@@ -13,17 +13,7 @@
db_get mldonkey-server/restart_after_upgrade
restart_after_upgrade="$RET"
-db_get mldonkey-server/launch_at_startup
-launch_at_startup="$RET"
-
-if [ "$launch_at_startup" = "false" ]; then
- # We stop any remaining server
- if command -v invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d --quiet mldonkey-server stop || true
- else
- /etc/init.d/mldonkey-server stop || true
- fi
-elif [ "$restart_after_upgrade" = "true" ] && [ "$launch_at_startup" = "true" ]; then
+if [ "$restart_after_upgrade" = "true" ]; then
if command -v invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d mldonkey-server stop
else
@@ -34,26 +24,6 @@
case "$1" in
configure)
- CONF=/etc/default/mldonkey-server
-
- if [ "$launch_at_startup" = "true" ]; then
-
- db_get mldonkey-server/mldonkey_umask
- mldonkey_umask="$RET"
- umask $mldonkey_umask
-
- db_get mldonkey-server/run_as_user
- run_as_user=$RET
-
- db_get mldonkey-server/mldonkey_group
- mldonkey_group=$RET
-
- db_get mldonkey-server/mldonkey_dir
- new_mldonkey_dir="$RET"
-
- db_get mldonkey-server/mldonkey_niceness
- mldonkey_niceness="$RET"
-
db_get mldonkey-server/client_name
client_name="$RET"
@@ -105,79 +75,56 @@
db_get mldonkey-server/password
password="$RET"
- db_get mldonkey-server/max_alive
- max_alive="$RET"
-
# Creating MLDonkey group if he isn't already there
- if ! getent group $mldonkey_group > /dev/null ; then
- addgroup --quiet $mldonkey_group
+ if ! getent group mldonkey > /dev/null ; then
+ addgroup --quiet mldonkey
fi
# Creating MLDonkey user if he isn't already there
- if ! getent passwd $run_as_user > /dev/null ; then
- adduser --quiet --system --ingroup $mldonkey_group \
- --home $new_mldonkey_dir --no-create-home $run_as_user
+ if ! getent passwd mldonkey > /dev/null ; then
+ adduser --quiet --system --ingroup mldonkey \
+ --home /var/lib/mldonkey --no-create-home mldonkey
fi
- run_as_useruid=`/usr/bin/id -u $run_as_user`
+ run_as_useruid=`/usr/bin/id -u mldonkey`
- if [ ! -d $new_mldonkey_dir ]; then
- $DEBUG && echo -n "Creating mldonkey home directory : "
- mkdir $new_mldonkey_dir
- $DEBUG && echo "done."
- fi
-
- if [ -f $MLDONKEY_DIR/downloads.ini ]; then
- db_get mldonkey-server/reown_file
-
- if [ "$RET" = "true" ]; then
- $DEBUG && echo -n "Reowning file of $MLDONKEY_DIR : "
- if ! dpkg-statoverride --list $MLDONKEY_DIR >/dev/null; then
- /bin/chown -R $run_as_user:$mldonkey_group $MLDONKEY_DIR
+ if [ -f /var/lib/mldonkey/downloads.ini ]; then
+ $DEBUG && echo -n "Reowning file of /var/lib/mldonkey : "
+ if ! dpkg-statoverride --list /var/lib/mldonkey >/dev/null; then
+ /bin/chown -R mldonkey:mldonkey /var/lib/mldonkey
fi
$DEBUG && echo "done."
- fi
-
- db_get mldonkey-server/mldonkey_move
- if [ "$RET" = "true" ] && [ "$new_mldonkey_dir" != "$MLDONKEY_DIR" ]; then
- $DEBUG && echo -n "Moving file of $MLDONKEY_DIR to $new_mldonkey_dir : "
- /bin/mv --target-directory=$new_mldonkey_dir $MLDONKEY_DIR/*
- $DEBUG && echo "done."
- fi
fi
- /usr/bin/touch $new_mldonkey_dir/downloads.ini
+ /usr/bin/touch /var/lib/mldonkey/downloads.ini
- if ! dpkg-statoverride --list $new_mldonkey_dir >/dev/null; then
- /bin/chown $run_as_user:$mldonkey_group $new_mldonkey_dir
+ if ! dpkg-statoverride --list /var/lib/mldonkey >/dev/null; then
+ /bin/chown mldonkey:mldonkey /var/lib/mldonkey
fi
- if ! dpkg-statoverride --list $new_mldonkey_dir/downloads.ini >/dev/null; then
- /bin/chown $run_as_user:$mldonkey_group $new_mldonkey_dir/downloads.ini
+ if ! dpkg-statoverride --list /var/lib/mldonkey/downloads.ini >/dev/null; then
+ /bin/chown mldonkey:mldonkey /var/lib/mldonkey/downloads.ini
fi
if ! dpkg-statoverride --list /var/run/mldonkey >/dev/null; then
- /bin/chown -R $run_as_user:$mldonkey_group /var/run/mldonkey
+ /bin/chown -R mldonkey:mldonkey /var/run/mldonkey
fi
if ! dpkg-statoverride --list /var/log/mldonkey >/dev/null; then
- /bin/chown -R $run_as_user:$mldonkey_group /var/log/mldonkey
+ /bin/chown -R mldonkey:mldonkey /var/log/mldonkey
fi
- /usr/bin/touch $CONF
-
- $DEBUG && echo -n "Creating backup of $new_mldonkey_dir/downloads.ini and $CONF : "
+ $DEBUG && echo -n "Creating backup of /var/lib/mldonkey/downloads.ini : "
- /bin/cp -p -f $new_mldonkey_dir/downloads.ini $new_mldonkey_dir/downloads.ini.dpkg
- /bin/cp -p -f $CONF $CONF.dpkg
+ /bin/cp -p -f /var/lib/mldonkey/downloads.ini /var/lib/mldonkey/downloads.ini.dpkg
$DEBUG && echo "done."
- $DEBUG && echo -n "Writing new values to $new_mldonkey_dir/downloads.ini : "
+ $DEBUG && echo -n "Writing new values to /var/lib/mldonkey/downloads.ini : "
- /usr/bin/mldonkey_options -f $new_mldonkey_dir/downloads.ini <<EOF
+ /usr/bin/mldonkey_options -f /var/lib/mldonkey/downloads.ini <<EOF
run_as_useruid=$run_as_useruid
-run_as_user="$run_as_user"
+run_as_user="mldonkey"
client_name="$client_name"
enable_directconnect=$enable_directconnect
enable_opennap=$enable_opennap
@@ -194,43 +141,13 @@
if [ -n "$password" ]; then
- $DEBUG && echo -n "Registering admin password in $new_mldonkey_dir/downloads.ini : "
+ $DEBUG && echo -n "Registering admin password in /var/lib/mldonkey/downloads.ini : "
- /usr/bin/mldonkey_users --add admin -q -f $new_mldonkey_dir/downloads.ini -p $password
+ /usr/bin/mldonkey_users --add admin -q -f /var/lib/mldonkey/downloads.ini -p $password
$DEBUG && echo "done."
fi
-
-
- MLDONKEY_DIR=$new_mldonkey_dir
- MLDONKEY_GROUP=$mldonkey_group
- MLDONKEY_UMASK=$mldonkey_umask
- MAX_ALIVE=$max_alive
-
- fi
-
- CONF_NEW=`/bin/tempfile`
- $DEBUG && echo -n "Writing new values to $CONF_NEW : "
-
- cat > $CONF_NEW <<EOF
-# MLDonkey configuration
-# please do not edit by hand
-# use dpkg-reconfigure mldonkey-server
-# This script is loaded by
-# /etc/init.d/mldonkey-server
-
-MLDONKEY_DIR=$new_mldonkey_dir
-MLDONKEY_GROUP=$mldonkey_group
-MLDONKEY_UMASK=$mldonkey_umask
-MAX_ALIVE=$max_alive
-LAUNCH_AT_STARTUP=$launch_at_startup
-MLDONKEY_NICENESS=$mldonkey_niceness
-EOF
-
- ucf $CONF_NEW $CONF
-
- $DEBUG && echo "done."
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u mldonkey-2.5.28/debian/mldonkey-server.default mldonkey-2.5.28/debian/mldonkey-server.default
--- mldonkey-2.5.28/debian/mldonkey-server.default
+++ mldonkey-2.5.28/debian/mldonkey-server.default
@@ -1,11 +1,7 @@
# MLDonkey configuration
-# please do not edit by hand
-# use dpkg-reconfigure mldonkey-server
# This script is loaded by
# /etc/init.d/mldonkey-server
-MLDONKEY_DIR=/var/lib/mldonkey
-MLDONKEY_GROUP=mldonkey
MLDONKEY_UMASK=0022
MAX_ALIVE=24
LAUNCH_AT_STARTUP=false
diff -u mldonkey-2.5.28/debian/mldonkey-server.postrm mldonkey-2.5.28/debian/mldonkey-server.postrm
--- mldonkey-2.5.28/debian/mldonkey-server.postrm
+++ mldonkey-2.5.28/debian/mldonkey-server.postrm
@@ -8,7 +8,6 @@
#set -x
DEBUG=false
-CONF=/etc/default/mldonkey-server
case "$1" in
remove)
@@ -31,7 +30,6 @@
else
/etc/init.d/mldonkey-server stop || true
fi
- ucf --purge $CONF
;;
disappear)
# This package has been completely overwritten by package $3
