--- Begin Message ---
Package: netmrg
Version: 0.18.2-14
Severity: normal
Tags: patch
Hi,
Attached is the diff for my netmrg 0.18.2-14.1 NMU during the current
BSP which I'll upload to delayed-0.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u netmrg-0.18.2/debian/control netmrg-0.18.2/debian/control
--- netmrg-0.18.2/debian/control
+++ netmrg-0.18.2/debian/control
@@ -2,12 +2,12 @@
Section: net
Priority: optional
Maintainer: Uwe Steinmann <[EMAIL PROTECTED]>
-Build-Depends: rrdtool, debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp9-dev, xsltproc, docbook-xsl
+Build-Depends: rrdtool, debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl
Standards-Version: 3.6.1
Package: netmrg
Architecture: any
-Depends: adduser, rrdtool, apache | httpd, php4 | php4-cgi, php4-cli, php4-mysql, mysql-client, debconf, wwwconfig-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: adduser, rrdtool, apache2 | httpd, php5 | php4 | php5-cgi | php4-cgi, php5-cli | php4-cli, php5-mysql | php4-mysql, mysql-client, debconf, wwwconfig-common, ${shlibs:Depends}, ${misc:Depends}
Suggests: mysql-server
Description: network monitoring tool
NetMRG is a database-driven network monitoring
diff -u netmrg-0.18.2/debian/changelog netmrg-0.18.2/debian/changelog
--- netmrg-0.18.2/debian/changelog
+++ netmrg-0.18.2/debian/changelog
@@ -1,3 +1,11 @@
+netmrg (0.18.2-14.1) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Fix unconditional use of debconf in postrm (Closes: #417011).
+ * Add php5 alternatives to dependencies (Closes: #424801).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 19 May 2007 17:45:35 +0200
+
netmrg (0.18.2-14) unstable; urgency=low
* Rebuild against the new libmysqlclient15off with correct symbols.
diff -u netmrg-0.18.2/debian/postrm netmrg-0.18.2/debian/postrm
--- netmrg-0.18.2/debian/postrm
+++ netmrg-0.18.2/debian/postrm
@@ -21,83 +21,89 @@
set -x
fi
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-db_get "netmrg/webserver" || true
-webserver="$RET"
-
-# Allows us to loop and substitute in one pass
-case $webserver in
- Apache2) webservers="apache2" ;;
- Apache) webservers="apache" ;;
- Apache-SSL) webservers="apache-ssl" ;;
- All) webservers="apache2 apache apache-ssl" ;;
- *) webservers="" ;;
-esac
+if [ -x /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+
+ db_get "netmrg/webserver" || true
+ webserver="$RET"
+
+ # Allows us to loop and substitute in one pass
+ case $webserver in
+ Apache2) webservers="apache2" ;;
+ Apache) webservers="apache" ;;
+ Apache-SSL) webservers="apache-ssl" ;;
+ All) webservers="apache2 apache apache-ssl" ;;
+ *) webservers="" ;;
+ esac
+fi
includefile=/etc/netmrg/netmrg.conf
case "$1" in
purge)
- db_get "netmrg/postrm"
- if [ "$RET" = "true" ] ; then
- # Get database configuration
- db_get "netmrg/db/user/name"
- dbuser="$RET"
- db_get "netmrg/db/user/password"
- dbpass="$RET"
- db_get "netmrg/db/host"
- dbserver="$RET"
- db_get "netmrg/db/name"
- dbname="$RET"
- db_get "netmrg/db/admin/name"
- dbadmin="$RET"
- db_reset "netmrg/db/admin/password"
- db_input critical "netmrg/db/admin/password" || true
- db_go || true
- db_get "netmrg/db/admin/password"
- dbadmpass="$RET"
- if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then
- . /usr/share/wwwconfig-common/mysql-dropdb.sh
- else
- echo "Cannot drop database (can't find wwwconfig-common script)." >&2
- fi
- if [ -e /usr/share/wwwconfig-common/mysql-dropuser.sh ] ; then
- . /usr/share/wwwconfig-common/mysql-dropuser.sh
- else
- echo "Cannot drop user (can't find wwwconfig-common script)." >&2
- fi
-
- rm -rf /var/lib/netmrg
- rm -rf /var/log/netmrg
-
- # Get rid of the user if the package is purged
- if getent passwd netmrg >/dev/null; then
- userdel netmrg
+ if [ -f /usr/share/debconf/confmodule ]; then
+ db_get "netmrg/postrm"
+ if [ "$RET" = "true" ] ; then
+ # Get database configuration
+ db_get "netmrg/db/user/name"
+ dbuser="$RET"
+ db_get "netmrg/db/user/password"
+ dbpass="$RET"
+ db_get "netmrg/db/host"
+ dbserver="$RET"
+ db_get "netmrg/db/name"
+ dbname="$RET"
+ db_get "netmrg/db/admin/name"
+ dbadmin="$RET"
+ db_reset "netmrg/db/admin/password"
+ db_input critical "netmrg/db/admin/password" || true
+ db_go || true
+ db_get "netmrg/db/admin/password"
+ dbadmpass="$RET"
+ if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then
+ . /usr/share/wwwconfig-common/mysql-dropdb.sh
+ else
+ echo "Cannot drop database (can't find wwwconfig-common script)." >&2
+ fi
+ if [ -e /usr/share/wwwconfig-common/mysql-dropuser.sh ] ; then
+ . /usr/share/wwwconfig-common/mysql-dropuser.sh
+ else
+ echo "Cannot drop user (can't find wwwconfig-common script)." >&2
+ fi
+
+ rm -rf /var/lib/netmrg
+ rm -rf /var/log/netmrg
+
+ # Get rid of the user if the package is purged
+ if getent passwd netmrg >/dev/null; then
+ if [ -x /usr/sbin/userdel ]; then
+ /usr/sbin/userdel netmrg
+ fi
+ fi
fi
- fi
- rm -rf /etc/netmrg
- for server in $webservers ; do
- # prefer conf.d over monolithic form
- if [ -d "/etc/${server}/conf.d" ] ; then
- if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
- rm "/etc/${server}/conf.d/netmrg.conf"
- status="purge"
- fi
- else
- conffile="/etc/$server/httpd.conf"
- if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
- . /usr/share/wwwconfig-common/apache-uninclude.sh
+ for server in $webservers ; do
+ # prefer conf.d over monolithic form
+ if [ -d "/etc/${server}/conf.d" ] ; then
+ if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
+ rm "/etc/${server}/conf.d/netmrg.conf"
+ status="purge"
+ fi
else
- echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+ conffile="/etc/$server/httpd.conf"
+ if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
+ . /usr/share/wwwconfig-common/apache-uninclude.sh
+ else
+ echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+ fi
fi
- fi
- if [ "$status" = "purge" ] ; then
- restart="$restart $server"
- fi
- done
+ if [ "$status" = "purge" ] ; then
+ restart="$restart $server"
+ fi
+ done
+ fi
+ rm -rf /etc/netmrg
servers="apache-ssl apache apache2 mysql"
if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then
. /usr/share/wwwconfig-common/restart.sh ||
@@ -109,25 +115,27 @@
;;
remove)
- for server in $webservers ; do
- # prefer conf.d over monolithic form
- if [ -d "/etc/${server}/conf.d" ] ; then
- if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
- rm "/etc/${server}/conf.d/netmrg.conf"
- status="purge"
- fi
- else
- conffile="/etc/$server/httpd.conf"
- if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
- . /usr/share/wwwconfig-common/apache-uninclude.sh
+ if [ -f /usr/share/debconf/confmodule ]; then
+ for server in $webservers ; do
+ # prefer conf.d over monolithic form
+ if [ -d "/etc/${server}/conf.d" ] ; then
+ if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
+ rm "/etc/${server}/conf.d/netmrg.conf"
+ status="purge"
+ fi
else
- echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+ conffile="/etc/$server/httpd.conf"
+ if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
+ . /usr/share/wwwconfig-common/apache-uninclude.sh
+ else
+ echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+ fi
fi
- fi
- if [ "$status" = "purge" ] ; then
- restart="$restart $server"
- fi
- done
+ if [ "$status" = "purge" ] ; then
+ restart="$restart $server"
+ fi
+ done
+ fi
servers="apache-ssl apache apache2 mysql"
if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then
diff -u netmrg-0.18.2/config.guess netmrg-0.18.2/config.guess
--- netmrg-0.18.2/config.guess
+++ netmrg-0.18.2/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -160,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -210,7 +212,7 @@
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +772,8 @@
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
@@ -777,10 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:MSYS_NT-*:*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[345]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -831,6 +835,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -947,6 +954,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -989,7 +999,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -1205,6 +1215,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff -u netmrg-0.18.2/config.sub netmrg-0.18.2/config.sub
--- netmrg-0.18.2/config.sub
+++ netmrg-0.18.2/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,15 +241,16 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,21 +276,19 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,18 +318,18 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,23 +358,21 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -912,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -923,6 +925,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1128,7 +1133,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1222,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1374,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1389,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1406,6 +1417,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
--- End Message ---
signature.asc
