[Pkg-zenoss-commits] r326 - in /trunk/packages/zenoss/debian/patches: 00list ZENHOME00-shellscripts.dpatch ZENHOME01-zenfunctions-pythonpath.dpatch ZENHOME10-zensocket-location.dpatch ZENHOME50-zen2load.dpatch ZENHOME90-Products.dpatch pysnmp-v3-env.dpatch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Nov 30 18:09:32 UTC 2007
Author: bzed-guest
Date: Fri Nov 30 18:09:31 2007
New Revision: 326
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=326
Log:
updating our patches for 2.1.1
Removed:
trunk/packages/zenoss/debian/patches/ZENHOME50-zen2load.dpatch
Modified:
trunk/packages/zenoss/debian/patches/00list
trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch
trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch
trunk/packages/zenoss/debian/patches/pysnmp-v3-env.dpatch
Modified: trunk/packages/zenoss/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/00list?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Fri Nov 30 18:09:31 2007
@@ -4,7 +4,6 @@
ZENHOME01-zenfunctions-pythonpath
ZENHOME02-add-missing-zenfunction-source
ZENHOME10-zensocket-location
-ZENHOME50-zen2load
ZENHOME90-Products
bin-zenoss-fix
ZenossInfo-rrd-version
Modified: trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME00-shellscripts.dpatch Fri Nov 30 18:09:31 2007
@@ -9,7 +9,7 @@
@DPATCH@
diff -urNad zenoss~/bin/fsrecover zenoss/bin/fsrecover
--- zenoss~/bin/fsrecover 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/fsrecover 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/fsrecover 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -19,9 +19,20 @@
PRGHOME=$ZENHOME/lib/python/ZODB
PRGNAME=fsrecover.py
+diff -urNad zenoss~/bin/reportmail zenoss/bin/reportmail
+--- zenoss~/bin/reportmail 2007-09-17 22:49:53.000000000 +0200
++++ zenoss/bin/reportmail 2007-11-30 18:43:09.000000000 +0100
+@@ -12,5 +12,6 @@
+
+ # For some reason the zenfunctions line eats part of $*. Store
+ # value now to use in call to zendmd.py
+-. $ZENHOME/bin/zenfunctions
++
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ $PYTHON $ZENHOME/Products/ZenReports/ReportMail.py "$CMD" $*
diff -urNad zenoss~/bin/zenactions zenoss/bin/zenactions
--- zenoss~/bin/zenactions 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenactions 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenactions 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -33,7 +44,7 @@
PRGNAME=zenactions.py
diff -urNad zenoss~/bin/zenbackup zenoss/bin/zenbackup
--- zenoss~/bin/zenbackup 2007-05-22 20:04:11.000000000 +0200
-+++ zenoss/bin/zenbackup 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenbackup 2007-11-30 18:40:34.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -43,7 +54,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/ZenBackup.py "$CMD" $*
diff -urNad zenoss~/bin/zenbatchload zenoss/bin/zenbatchload
--- zenoss~/bin/zenbatchload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenbatchload 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenbatchload 2007-11-30 18:40:34.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -53,7 +64,7 @@
$PYTHON $ZENHOME/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*
diff -urNad zenoss~/bin/zenbuild zenoss/bin/zenbuild
--- zenoss~/bin/zenbuild 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenbuild 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenbuild 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -65,7 +76,7 @@
diff -urNad zenoss~/bin/zenchkrels zenoss/bin/zenchkrels
--- zenoss~/bin/zenchkrels 2007-04-26 20:57:02.000000000 +0200
-+++ zenoss/bin/zenchkrels 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenchkrels 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -75,7 +86,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/CheckRelations.py "$CMD" $*
diff -urNad zenoss~/bin/zenchkschema zenoss/bin/zenchkschema
--- zenoss~/bin/zenchkschema 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenchkschema 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenchkschema 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -85,7 +96,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $*
diff -urNad zenoss~/bin/zencommand zenoss/bin/zencommand
--- zenoss~/bin/zencommand 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zencommand 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zencommand 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -97,7 +108,7 @@
PRGNAME=zencommand.py
diff -urNad zenoss~/bin/zendevicedump zenoss/bin/zendevicedump
--- zenoss~/bin/zendevicedump 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendevicedump 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zendevicedump 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -107,7 +118,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ExportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendeviceload zenoss/bin/zendeviceload
--- zenoss~/bin/zendeviceload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendeviceload 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zendeviceload 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -117,7 +128,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ImportDevices.py "$CMD" $*
diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
--- zenoss~/bin/zendisc 2007-05-11 21:04:45.000000000 +0200
-+++ zenoss/bin/zendisc 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zendisc 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -129,7 +140,7 @@
PRGHOME=$ZENHOME/Products/DataCollector
diff -urNad zenoss~/bin/zendmd zenoss/bin/zendmd
--- zenoss~/bin/zendmd 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendmd 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zendmd 2007-11-30 18:40:34.000000000 +0100
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -138,8 +149,8 @@
+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
$PYTHON -i $ZENHOME/Products/ZenModel/zendmd.py "$CMD" $*
diff -urNad zenoss~/bin/zendoc zenoss/bin/zendoc
---- zenoss~/bin/zendoc 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendoc 2007-09-07 00:11:14.000000000 +0200
+--- zenoss~/bin/zendoc 2007-09-27 20:49:58.000000000 +0200
++++ zenoss/bin/zendoc 2007-11-30 18:40:34.000000000 +0100
@@ -9,7 +9,7 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -151,7 +162,7 @@
cd $ZENHOME/Products
diff -urNad zenoss~/bin/zendump zenoss/bin/zendump
--- zenoss~/bin/zendump 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zendump 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zendump 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -161,7 +172,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/ExportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zeneventlog zenoss/bin/zeneventlog
--- zenoss~/bin/zeneventlog 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zeneventlog 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zeneventlog 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -173,7 +184,7 @@
PRGNAME=zeneventlog.py
diff -urNad zenoss~/bin/zenhub zenoss/bin/zenhub
--- zenoss~/bin/zenhub 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenhub 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenhub 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -185,7 +196,7 @@
PRGNAME=zenhub.py
diff -urNad zenoss~/bin/zenload zenoss/bin/zenload
--- zenoss~/bin/zenload 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenload 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenload 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -194,20 +205,20 @@
+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
$PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*
diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
---- zenoss~/bin/zenmail 2007-07-10 20:56:40.000000000 +0200
-+++ zenoss/bin/zenmail 2007-09-07 00:11:14.000000000 +0200
-@@ -10,7 +10,7 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
--. $ZENHOME/bin/zenfunctions
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-
- SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=25 -- "
- PRGHOME=$ZENHOME/Products/ZenEvents
+--- zenoss~/bin/zenmail 2007-11-05 16:52:14.000000000 +0100
++++ zenoss/bin/zenmail 2007-11-30 18:40:34.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+
+ PORT=`getPort 25 --listenPort $@`
+ SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=$PORT -- "
diff -urNad zenoss~/bin/zenmib zenoss/bin/zenmib
--- zenoss~/bin/zenmib 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmib 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenmib 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -219,7 +230,7 @@
PRGNAME=zenmib.py
diff -urNad zenoss~/bin/zenmigrate zenoss/bin/zenmigrate
--- zenoss~/bin/zenmigrate 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmigrate 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenmigrate 2007-11-30 18:40:34.000000000 +0100
@@ -12,5 +12,5 @@
# For some reason the zenfunctions line eats part of $*. Store
@@ -229,7 +240,7 @@
$PYTHON $ZENHOME/Products/ZenModel/migrate/zenmigrate.py "$CMD" $*
diff -urNad zenoss~/bin/zenmodeler zenoss/bin/zenmodeler
--- zenoss~/bin/zenmodeler 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenmodeler 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenmodeler 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -241,7 +252,7 @@
PRGHOME=$ZENHOME/Products/DataCollector
diff -urNad zenoss~/bin/zenoss zenoss/bin/zenoss
--- zenoss~/bin/zenoss 2007-07-10 20:56:55.000000000 +0200
-+++ zenoss/bin/zenoss 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenoss 2007-11-30 18:40:34.000000000 +0100
@@ -49,7 +49,7 @@
exec su - $USERNAME $0 $@
fi
@@ -252,18 +263,28 @@
C="$C zeoctl"
C="$C zopectl"
diff -urNad zenoss~/bin/zenpack zenoss/bin/zenpack
---- zenoss~/bin/zenpack 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenpack 2007-09-07 00:11:14.000000000 +0200
-@@ -10,5 +10,5 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
--. $ZENHOME/bin/zenfunctions
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
- $PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*
+--- zenoss~/bin/zenpack 2007-11-02 18:47:00.000000000 +0100
++++ zenoss/bin/zenpack 2007-11-30 18:40:34.000000000 +0100
+@@ -10,12 +10,6 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-if [ -z "$ZENHOME" ] ; then
+- echo ERROR: '$ZENHOME' is not set.
+- echo This is usually caused by executing this command as root rather than \
+-as the zenoss user. Either define '$ZENHOME' or run this command as a \
+-different user.
+-else
+- . $ZENHOME/bin/zenfunctions
+- $PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*
+-fi
+\ No newline at end of file
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
++
++$PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*
diff -urNad zenoss~/bin/zenperfsnmp zenoss/bin/zenperfsnmp
--- zenoss~/bin/zenperfsnmp 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenperfsnmp 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenperfsnmp 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -275,7 +296,7 @@
PRGNAME=zenperfsnmp.py
diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
--- zenoss~/bin/zenping 2007-05-11 21:04:45.000000000 +0200
-+++ zenoss/bin/zenping 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenping 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -287,7 +308,7 @@
PRGHOME=$ZENHOME/Products/ZenStatus
diff -urNad zenoss~/bin/zenpop3 zenoss/bin/zenpop3
--- zenoss~/bin/zenpop3 2007-07-03 21:29:46.000000000 +0200
-+++ zenoss/bin/zenpop3 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenpop3 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -299,7 +320,7 @@
PRGHOME=$ZENHOME/Products/ZenEvents
diff -urNad zenoss~/bin/zenprocess zenoss/bin/zenprocess
--- zenoss~/bin/zenprocess 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenprocess 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenprocess 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -311,7 +332,7 @@
PRGNAME=zenprocess.py
diff -urNad zenoss~/bin/zenprodrm zenoss/bin/zenprodrm
--- zenoss~/bin/zenprodrm 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenprodrm 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenprodrm 2007-11-30 18:40:34.000000000 +0100
@@ -16,7 +16,7 @@
echo No actions taken.
exit
@@ -323,7 +344,7 @@
diff -urNad zenoss~/bin/zenrender zenoss/bin/zenrender
--- zenoss~/bin/zenrender 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenrender 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenrender 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -335,7 +356,7 @@
PRGNAME=zenrender.py
diff -urNad zenoss~/bin/zenrestore zenoss/bin/zenrestore
--- zenoss~/bin/zenrestore 2007-05-22 20:04:11.000000000 +0200
-+++ zenoss/bin/zenrestore 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenrestore 2007-11-30 18:40:34.000000000 +0100
@@ -10,5 +10,5 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -345,7 +366,7 @@
$PYTHON $ZENHOME/Products/ZenUtils/ZenRestore.py "$CMD" $*
diff -urNad zenoss~/bin/zenschamadoc zenoss/bin/zenschamadoc
--- zenoss~/bin/zenschamadoc 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenschamadoc 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenschamadoc 2007-11-30 18:40:34.000000000 +0100
@@ -9,5 +9,5 @@
#
# For complete information please visit: http://www.zenoss.com/oss/
@@ -355,7 +376,7 @@
$PYTHON $ZENHOME/Products/ZenRelations/schemadoc.py Products.ZenModel
diff -urNad zenoss~/bin/zenstatus zenoss/bin/zenstatus
--- zenoss~/bin/zenstatus 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenstatus 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenstatus 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -366,20 +387,20 @@
PRGHOME=$ZENHOME/Products/ZenStatus
PRGNAME=zenstatus.py
diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
---- zenoss~/bin/zensyslog 2007-07-03 21:28:36.000000000 +0200
-+++ zenoss/bin/zensyslog 2007-09-07 00:11:14.000000000 +0200
-@@ -10,7 +10,7 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
--. $ZENHOME/bin/zenfunctions
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-
- SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=514 -- "
- PRGHOME=$ZENHOME/Products/ZenEvents
+--- zenoss~/bin/zensyslog 2007-11-05 16:52:14.000000000 +0100
++++ zenoss/bin/zensyslog 2007-11-30 18:40:34.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+
+ PORT=`getPort 514 --syslogport $@`
+ SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=$PORT -- "
diff -urNad zenoss~/bin/zentestcommand zenoss/bin/zentestcommand
--- zenoss~/bin/zentestcommand 2007-07-10 17:34:01.000000000 +0200
-+++ zenoss/bin/zentestcommand 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zentestcommand 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -390,20 +411,20 @@
PRGHOME=$ZENHOME/Products/ZenRRD
PRGNAME=zentestcommand.py
diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
---- zenoss~/bin/zentrap 2007-07-03 21:28:36.000000000 +0200
-+++ zenoss/bin/zentrap 2007-09-07 00:11:14.000000000 +0200
-@@ -10,7 +10,7 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
--. $ZENHOME/bin/zenfunctions
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-
- SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=162 -- "
- PRGHOME=$ZENHOME/Products/ZenEvents
+--- zenoss~/bin/zentrap 2007-11-05 16:52:14.000000000 +0100
++++ zenoss/bin/zentrap 2007-11-30 18:40:34.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+
+-. $ZENHOME/bin/zenfunctions
++. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+
+ PORT=`getPort 162 --trapport $@`
+ PORT=`getPort $PORT -t $@`
diff -urNad zenoss~/bin/zenwin zenoss/bin/zenwin
--- zenoss~/bin/zenwin 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenwin 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenwin 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -415,7 +436,7 @@
PRGNAME=zenwin.py
diff -urNad zenoss~/bin/zenwinmodeler zenoss/bin/zenwinmodeler
--- zenoss~/bin/zenwinmodeler 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zenwinmodeler 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zenwinmodeler 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
@@ -427,7 +448,7 @@
PRGNAME=zenwinmodeler.py
diff -urNad zenoss~/bin/zproprmlocal zenoss/bin/zproprmlocal
--- zenoss~/bin/zproprmlocal 2007-04-20 15:48:17.000000000 +0200
-+++ zenoss/bin/zproprmlocal 2007-09-07 00:11:14.000000000 +0200
++++ zenoss/bin/zproprmlocal 2007-11-30 18:40:34.000000000 +0100
@@ -10,7 +10,7 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
Modified: trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch Fri Nov 30 18:09:31 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
---- zenoss~/bin/zenfunctions 2007-08-16 15:45:03.000000000 +0200
-+++ zenoss/bin/zenfunctions 2007-09-24 21:58:50.000000000 +0200
+--- zenoss~/bin/zenfunctions 2007-11-05 16:52:14.000000000 +0100
++++ zenoss/bin/zenfunctions 2007-11-30 18:43:42.000000000 +0100
@@ -9,18 +9,17 @@
# For complete information please visit: http://www.zenoss.com/oss/
#############################################################################
Modified: trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME10-zensocket-location.dpatch Fri Nov 30 18:09:31 2007
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
---- zenoss~/bin/zendisc 2007-09-07 00:22:38.000000000 +0200
-+++ zenoss/bin/zendisc 2007-09-07 00:22:39.000000000 +0200
+--- zenoss~/bin/zendisc 2007-11-30 18:56:10.000000000 +0100
++++ zenoss/bin/zendisc 2007-11-30 18:56:11.000000000 +0100
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -18,20 +18,20 @@
PRGNAME=zendisc.py
CFGFILE=$CFGDIR/zendisc.conf
diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
---- zenoss~/bin/zenmail 2007-09-07 00:22:38.000000000 +0200
-+++ zenoss/bin/zenmail 2007-09-07 00:22:39.000000000 +0200
-@@ -12,7 +12,7 @@
-
+--- zenoss~/bin/zenmail 2007-11-30 18:56:10.000000000 +0100
++++ zenoss/bin/zenmail 2007-11-30 18:57:23.000000000 +0100
+@@ -13,7 +13,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
--SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=25 -- "
-+SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=tcp --port=25 -- "
+ PORT=`getPort 25 --listenPort $@`
+-SUDO="$ZENHOME/bin/zensocket --listen --proto=tcp --port=$PORT -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=tcp --port=$PORT -- "
PRGHOME=$ZENHOME/Products/ZenEvents
PRGNAME=zenmail.py
CFGFILE=$CFGDIR/zenmail.conf
diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
---- zenoss~/bin/zenping 2007-09-07 00:22:38.000000000 +0200
-+++ zenoss/bin/zenping 2007-09-07 00:22:39.000000000 +0200
+--- zenoss~/bin/zenping 2007-11-30 18:56:10.000000000 +0100
++++ zenoss/bin/zenping 2007-11-30 18:56:11.000000000 +0100
@@ -12,7 +12,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -42,26 +42,26 @@
PRGNAME=zenping.py
CFGFILE=$CFGDIR/zenping.conf
diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
---- zenoss~/bin/zensyslog 2007-09-07 00:22:38.000000000 +0200
-+++ zenoss/bin/zensyslog 2007-09-07 00:22:39.000000000 +0200
-@@ -12,7 +12,7 @@
-
+--- zenoss~/bin/zensyslog 2007-11-30 18:56:10.000000000 +0100
++++ zenoss/bin/zensyslog 2007-11-30 18:57:04.000000000 +0100
+@@ -13,7 +13,7 @@
. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
--SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=514 -- "
-+SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=udp --port=514 -- "
+ PORT=`getPort 514 --syslogport $@`
+-SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=$PORT -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=udp --port=$PORT -- "
PRGHOME=$ZENHOME/Products/ZenEvents
PRGNAME=zensyslog.py
CFGFILE=$CFGDIR/zensyslog.conf
diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
---- zenoss~/bin/zentrap 2007-09-07 00:22:38.000000000 +0200
-+++ zenoss/bin/zentrap 2007-09-07 00:22:39.000000000 +0200
-@@ -12,7 +12,7 @@
+--- zenoss~/bin/zentrap 2007-11-30 18:56:10.000000000 +0100
++++ zenoss/bin/zentrap 2007-11-30 18:57:38.000000000 +0100
+@@ -14,7 +14,7 @@
- . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-
--SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=162 -- "
-+SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=udp --port=162 -- "
+ PORT=`getPort 162 --trapport $@`
+ PORT=`getPort $PORT -t $@`
+-SUDO="$ZENHOME/bin/zensocket --listen --proto=udp --port=$PORT -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen --proto=udp --port=$PORT -- "
PRGHOME=$ZENHOME/Products/ZenEvents
PRGNAME=zentrap.py
CFGFILE=$CFGDIR/zentrap.conf
Modified: trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch Fri Nov 30 18:09:31 2007
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/help/Administration.stx zenoss/Products/ZenModel/help/Administration.stx
--- zenoss~/Products/ZenModel/help/Administration.stx 2004-05-18 22:37:04.000000000 +0200
-+++ zenoss/Products/ZenModel/help/Administration.stx 2007-09-24 20:02:40.000000000 +0200
++++ zenoss/Products/ZenModel/help/Administration.stx 2007-11-30 19:02:46.000000000 +0100
@@ -5,7 +5,7 @@
Environment
@@ -17,39 +17,30 @@
<p>SYBASE - path to the sybase install used to connect to netcool. Normally this is set automatically based on ZENHOME</p>
<p>ORACLE_HOME - path to the oracle client install used to connect to the netcool history database.</p>
-diff -urNad zenoss~/Products/ZenUITests/tests/selenium/zentestsuite zenoss/Products/ZenUITests/tests/selenium/zentestsuite
---- zenoss~/Products/ZenUITests/tests/selenium/zentestsuite 2007-08-16 17:11:40.000000000 +0200
-+++ zenoss/Products/ZenUITests/tests/selenium/zentestsuite 2007-09-24 20:02:40.000000000 +0200
-@@ -10,6 +10,8 @@
- # For complete information please visit: http://www.zenoss.com/oss/
- #############################################################################
-
-+. $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
-+
- cd $ZENHOME/Products/
- svn up
- zenmigrate
diff -urNad zenoss~/Products/ZenUtils/Utils.py zenoss/Products/ZenUtils/Utils.py
---- zenoss~/Products/ZenUtils/Utils.py 2007-09-24 16:10:05.000000000 +0200
-+++ zenoss/Products/ZenUtils/Utils.py 2007-09-24 20:06:16.000000000 +0200
+--- zenoss~/Products/ZenUtils/Utils.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenUtils/Utils.py 2007-11-30 19:02:46.000000000 +0100
@@ -21,6 +21,7 @@
import sys
import os
+import pwd
import types
- import struct
import logging
-@@ -541,4 +542,4 @@
+ import re
+@@ -539,7 +540,7 @@
def zenPath(*args):
args = [a.strip('/') for a in args]
- return os.path.join(os.environ['ZENHOME'], *args)
+ return os.path.join(pwd.getpwnam('zenoss')[5], *args)
+
+ def extractPostContent(REQUEST):
+ """
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
---- zenoss~/Products/ZenUtils/ZenBackup.py 2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-09-24 20:02:40.000000000 +0200
-@@ -126,7 +126,7 @@
+--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-11-30 19:02:46.000000000 +0100
+@@ -125,7 +125,7 @@
default=None,
help='File to backup to.'
' Backups will by default be placed'
@@ -59,9 +50,9 @@
dest="noEventsDb",
default=False,
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py 2007-09-24 16:10:05.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-09-24 20:02:40.000000000 +0200
-@@ -272,7 +272,7 @@
+--- zenoss~/Products/ZenUtils/zenpack.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenUtils/zenpack.py 2007-11-30 19:02:46.000000000 +0100
+@@ -275,7 +275,7 @@
action="store_true",
default=False,
help="symlink the zenpack dir instead of"
Modified: trunk/packages/zenoss/debian/patches/pysnmp-v3-env.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/pysnmp-v3-env.dpatch?rev=326&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/pysnmp-v3-env.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/pysnmp-v3-env.dpatch Fri Nov 30 18:09:31 2007
@@ -6,15 +6,16 @@
@DPATCH@
diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
---- zenoss~/bin/zenfunctions 2007-07-10 21:33:08.000000000 +0200
-+++ zenoss/bin/zenfunctions 2007-07-10 21:34:03.000000000 +0200
-@@ -27,6 +27,9 @@
+--- zenoss~/bin/zenfunctions 2007-11-30 19:04:48.000000000 +0100
++++ zenoss/bin/zenfunctions 2007-11-30 19:05:20.000000000 +0100
+@@ -26,6 +26,10 @@
VARDIR=$ZENHOME/var
CFGDIR=$ZENHOME/etc
+PYSNMP_API_VERSION='v3'
+export PYSNMP_API_VERSION
+
- ZENPRODUCTS="ZenModel NcoProduct ZenUtils SiteScopeParser ZenRelations ZenStatus SnmpCollector ZenRRD DataCollector ZenWidgets ZenEvents"
++
+ ZENPRODUCTS="ZenModel ZenHub ZenReports ZenWin ZenUtils SiteScopeParser ZenRelations ZenStatus SnmpCollector ZenRRD DataCollector ZenWidgets ZenEvents"
SYS=`uname`
More information about the Pkg-zenoss-commits
mailing list