diff options
| author | Marius Halden <marius.h@lden.org> | 2016-12-27 14:13:51 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-12-27 14:13:51 +0100 |
| commit | d35affbcea87f453fb20c4bb545a10b668eae81b (patch) | |
| tree | a6856cc15f6ba10c79d737a61e2773cba12bf558 /debian | |
| parent | 184c46d3507a0ff9fc68a4409f690add96cd183d (diff) | |
| parent | 9cdcef077ed523966f508a3721944a16425734cb (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/bitlbee-common.config | 8 | ||||
| -rw-r--r-- | debian/bitlbee-common.postinst | 4 | ||||
| -rw-r--r-- | debian/control | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/debian/bitlbee-common.config b/debian/bitlbee-common.config index c2437b54..927f646f 100644 --- a/debian/bitlbee-common.config +++ b/debian/bitlbee-common.config @@ -12,13 +12,7 @@ if [ -n "$BITLBEE_PORT" ]; then else db_get bitlbee/serveport if [ "$RET" = "stillhavetoask" ]; then - listens=$(netstat -ltn | awk '{print $4}') - for port in 6667 6666 6668 6669; do - if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then - break - fi - done - db_set bitlbee/serveport $port; + db_set bitlbee/serveport 6667; fi fi diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst index e0e371d8..477bdee4 100644 --- a/debian/bitlbee-common.postinst +++ b/debian/bitlbee-common.postinst @@ -70,10 +70,10 @@ fi ## If we're upgrading, we'll probably skip this next part if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then echo 'BitlBee (probably) already installed, skipping user/configdir installation' - exit 0 +else + adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee fi -adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee chmod 700 /var/lib/bitlbee/ ## Can't do this in packaging phase: Don't know the UID yet. Access to diff --git a/debian/control b/debian/control index d83f089e..9dac2ef8 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Description: IRC to other chat networks gateway (using libpurple) Package: bitlbee-common Architecture: all -Depends: ${misc:Depends}, net-tools, adduser +Depends: ${misc:Depends}, adduser Replaces: bitlbee Description: IRC to other chat networks gateway (common files/docs) This program can be used as an IRC server which forwards everything you |