changeset 396:e144202d2d96 noffle

[svn] updated deb'configuration
author godisch
date Thu, 29 May 2003 15:55:19 +0100
parents 056d5fcb7f4b
children b66bff23a0ef
files debian/config debian/lintian
diffstat 2 files changed, 3 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/debian/config	Thu May 29 15:44:56 2003 +0100
+++ b/debian/config	Thu May 29 15:55:19 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: config 537 2003-05-29 14:44:56Z godisch $
+# $Id: config 538 2003-05-29 14:55:19Z godisch $
 
 set -e
 . /usr/share/debconf/confmodule
@@ -27,47 +27,6 @@
 	debian_config=/etc/noffle/conf.debian
 fi
 
-# read server port value from inetd.conf
-port="`grep '[[:space:]]/usr/bin/noffle[[:space:]]' /etc/inetd.conf | head -n 1 | sed 's/^#<off># //;s/[[:space:]].*//' 2> /dev/null`" || :
-if [ "$port" ]; then
-	# read port value from debconf db
-	db_get noffle/port
-	# for upgrading from < 1.1.2
-	[ "$RET" = 119 ] && RET=nntp || :
-	# we need confirmation, if they differ
-	[ "$port" = "$RET" ] || db_fset noffle/port seen false
-	# write current port from inetd.conf into debconf db
-	[ "$port" = "${port#\#}" ] && db_set noffle/port "$port" || :
-fi
-
-# read server, username, password, maxfetch, default-expire from $server_config
-if [ -s "$server_config" ]; then
-	db_get noffle/server
-	server="`grep '^server' $server_config | head -n 1 | sed 's/^server[[:space:]]*//;s/[[:space:]].*//' 2> /dev/null`" || :
-	[ "$server" = "$RET" ] || db_fset noffle/server seen false
-	[ "$server" ] && db_set noffle/server "$server" || :
-
-	db_get noffle/username
-	server="`grep '^server' $server_config | head -n 1 | sed 's/^server[[:space:]]*//;s/[^[:space:]]*[[:space:]]*//;s/[[:space:]].*//' 2> /dev/null`" || :
-	[ "$username" = "$RET" ] || db_fset noffle/username seen false
-	[ "$username" ] && db_set noffle/username "$username" || :
-
-	db_get noffle/password
-	server="`grep '^server' $server_config | head -n 1 | sed 's/^server[[:space:]]*//;s/[^[:space:]]*[[:space:]]*//;s/[^[:space:]]*[[:space:]]*//;s/[[:space:]].*//' 2> /dev/null`" || :
-	[ "$password" = "$RET" ] || db_fset noffle/password seen false
-	[ "$password" ] && db_set noffle/password "$password" || :
-
-	db_get noffle/maxfetch
-	maxfetch="`grep '^max-fetch' $server_config | head -n 1 | sed 's/^max-fetch[[:space:]]*//' 2> /dev/null`" || :
-	[ "$maxfetch" = "$RET" ] || db_fset noffle/maxfetch seen false
-	[ "$maxfetch" ] && db_set noffle/maxfetch "$maxfetch" || :
-
-	db_get noffle/default-expire
-	defexpire="`grep '^default-expire' $server_config | head -n 1 | sed 's/^default-expire[[:space:]]*//' 2> /dev/null`" || :
-	[ "$defexpire" = "$RET" ] || db_fset noffle/defexpire seen false
-	[ "$defexpire" ] && db_set noffle/default-expire "$defexpire" || :
-fi
-
 # for backward compatibility < 1.1.2-1
 if dpkg --compare-versions "$2" lt-nl 1.1.2; then
 	db_get noffle/fetchmode
@@ -77,18 +36,6 @@
 	esac
 fi
 
-# read NOFFLE_FETCHMODE from $debian_config
-[ -s "$debian_config" ] && . $debian_config || :
-[ "$NOFFLE_FETCHMODE" = ppp -o "$NOFFLE_FETCHMODE" = cron ] || \
-if [ -x /usr/sbin/pppd ]; then
-	NOFFLE_FETCHMODE=ppp
-else
-	NOFFLE_FETCHMODE=cron
-fi
-# do we need confirmation?
-db_get noffle/fetchmode
-[ "$NOFFLE_FETCHMODE" = "$RET" ] || db_fset noffle/fetchmode seen false
-
 # input configuration using backup capability, see debconf-devel(8)
 state=1
 laststate=7
--- a/debian/lintian	Thu May 29 15:44:56 2003 +0100
+++ b/debian/lintian	Thu May 29 15:55:19 2003 +0100
@@ -6,3 +6,5 @@
 noffle: non-standard-dir-perm var/spool/noffle/outgoing/ 2755 != 0755
 noffle: non-standard-dir-perm var/spool/noffle/overview/ 2755 != 0755
 noffle: setuid-gid-binary usr/bin/noffle 6755 news/news
+noffle: seen-flag-requires-versioned-depends config
+noffle: missing-debconf-dependency