Index: xymon-4.3.7/xymonnet/contest.c =================================================================== --- xymon-4.3.7/xymonnet/contest.c (Revision 1) +++ xymon-4.3.7/xymonnet/contest.c (Revision 8) @@ -478,8 +478,10 @@ if (item->sslctx == NULL) { switch (item->ssloptions->sslversion) { +#if 0 case SSLVERSION_V2: item->sslctx = SSL_CTX_new(SSLv2_client_method()); break; +#endif case SSLVERSION_V3: item->sslctx = SSL_CTX_new(SSLv3_client_method()); break; case SSLVERSION_TLS1: Index: xymon-4.3.7/debian/control =================================================================== --- xymon-4.3.7/debian/control (Revision 1) +++ xymon-4.3.7/debian/control (Revision 8) @@ -2,7 +2,7 @@ Section: net Priority: extra Maintainer: Henrik Stoerner -Build-Depends: debhelper (>= 7), librrd2-dev, libssl-dev, libldap2-dev, libpcre3-dev +Build-Depends: debhelper (>= 7), librrd2-dev, libssl-dev, libldap2-dev, libpcre3-dev, fping Standards-Version: 3.8.3 Homepage: http://xymon.sourceforge.net/ @@ -30,7 +30,7 @@ Conflicts: hobbit, hobbit-client Provides: xymon-client Replaces: hobbit, hobbit-client -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base, fping Description: client for the Xymon network monitor Client data collection package for Xymon (previously known as Hobbit). This gathers statistics and data from a single system and reports it to Index: xymon-4.3.7/debian/changelog =================================================================== --- xymon-4.3.7/debian/changelog (Revision 1) +++ xymon-4.3.7/debian/changelog (Revision 8) @@ -1,3 +1,23 @@ +xymon (4.3.7-8bakarasse5) unstable; urgency=low + + * Add "include /etc/default/xymon-client" to client/xymonclient.cfg.DIST + * Add "MACHINE="$CLIENTHOSTNAME" and "MACHINEDOTS="$CLIENTHOSTNAME" to client/xymonclient.cfg.DIST + * Fix debian/rules to add include lines to client/xymonclient.cfg and clientlaunch.cfg + + -- Alexander Bech Fri, 3 Feb 2012 14:40:00 +0100 + +xymon (4.3.7-8bakarasse4) unstable; urgency=low + + * Fix the symbolic link in $XYMONHOME/etc get overwritten and recreated as a directory in client/clientupdate.c + * Add chown xymon:xymon on /etc/xymon and /usr/lib/xymon to debian/init-common.sh + * Change USEXYMONPING=y to USEXYMONPING=n in debian/rules + * Add fping to Build-Depends: and Depends: in debian/control + * Fix dh_installinit and dh_installlogrotate in debian/rules + * Fix build/ldap.sa, pcre.sh, and ssh.sh configure error + * Fix compile error (622069-sslv2-deprecation) in xymonnet/contest.c + + -- Alexander Bech Thu, 26 Jan 2012 15:46:00 +0100 + xymon (4.3.7) unstable; urgency=low * rev 6803 Index: xymon-4.3.7/debian/xymon-client.files =================================================================== --- xymon-4.3.7/debian/xymon-client.files (Revision 1) +++ xymon-4.3.7/debian/xymon-client.files (Revision 8) @@ -11,3 +11,4 @@ usr/share/man/man1/logfetch.1 usr/share/man/man8/msgcache.8 usr/share/man/man1/orcaxymon.1 +usr/share/man/man1/xymonnet.1 Index: xymon-4.3.7/debian/rules =================================================================== --- xymon-4.3.7/debian/rules (Revision 1) +++ xymon-4.3.7/debian/rules (Revision 8) @@ -11,7 +11,7 @@ Makefile: configure dh_testdir # Add here commands to configure the package. - USEXYMONPING=y \ + USEXYMONPING=n \ ENABLESSL=y \ ENABLELDAP=y \ ENABLELDAPSSL=y \ @@ -104,7 +104,15 @@ # dynamic list of installed client extensions echo "include /var/run/xymon/clientlaunch-include.cfg" >> \ $C/etc/xymon/clientlaunch.cfg + echo "directory /etc/xymon/clientlaunch.d" >> \ + $C/etc/xymon/clientlaunch.cfg + echo "include /var/run/xymon/bbdisp-runtime.cfg" >> \ + $C/etc/xymon/xymonclient.cfg + echo "directory /etc/xymon/xymonclient.d" >> \ + $C/etc/xymon/xymonclient.cfg rm $C/usr/lib/xymon/client/runclient.sh + # xymonnet binary is needed if client dynamically rise in the network tester level + cp $S/usr/lib/xymon/server/bin/xymonnet $C/usr/lib/xymon/client/bin/ binary: binary-arch binary-indep @@ -137,9 +145,8 @@ rmdir $S/usr/share/man/man7 dh_installdebconf -a # use the old file names for now - dh_installlogrotate --name=xymon-client -a - dh_installinit --name=xymon -p'xymon' -- defaults 98 02 - dh_installinit --name=xymon-client -p'xymon-client' -- defaults 98 02 + dh_installlogrotate -a + dh_installinit -- defaults 98 02 dh_installman -a dh_link -a dh_strip -a Index: xymon-4.3.7/debian/init-common.sh =================================================================== --- xymon-4.3.7/debian/init-common.sh (Revision 1) +++ xymon-4.3.7/debian/init-common.sh (Revision 8) @@ -14,6 +14,13 @@ chown xymon:xymon /var/run/xymon fi + if [ "$(stat -c %U /etc/xymon)" != "xymon" -o "$(stat -c %G /etc/xymon)" != "xymon" ] ; then + chown -R xymon:xymon /etc/xymon + fi + if [ "$(stat -c %U /usr/lib/xymon)" != "xymon" -o "$(stat -c %G /usr/lib/xymon)" != "xymon" ] ; then + chown -R xymon:xymon /usr/lib/xymon + fi + set -- $XYMONSERVERS if [ $# -eq 1 ]; then echo "XYMSRV=\"$XYMONSERVERS\"" Index: xymon-4.3.7/build/ldap.sh =================================================================== --- xymon-4.3.7/build/ldap.sh (Revision 1) +++ xymon-4.3.7/build/ldap.sh (Revision 8) @@ -25,6 +25,22 @@ then LDAPLIB=$DIR/lib64 fi + if test -f $DIR/lib/i386-linux-gnu/libldap.so + then + LDAPLIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/i386-linux-gnu/libldap.a + then + LDAPLIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libldap.so + then + LDAPLIB=$DIR/lib/x86_64-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libldap.a + then + LDAPLIB=$DIR/lib/x86_64-linux-gnu + fi done if test "$USERLDAPINC" != ""; then Index: xymon-4.3.7/build/pcre.sh =================================================================== --- xymon-4.3.7/build/pcre.sh (Revision 1) +++ xymon-4.3.7/build/pcre.sh (Revision 8) @@ -29,6 +29,22 @@ then PCRELIB=$DIR/lib64 fi + if test -f $DIR/lib/i386-linux-gnu/libpcre.so + then + PCRELIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/i386-linux-gnu/libpcre.a + then + PCRELIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libpcre.so + then + PCRELIB=$DIR/lib/x86_64-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libpcre.a + then + PCRELIB=$DIR/lib/x86_64-linux-gnu + fi done if test "$USERPCREINC" != ""; then Index: xymon-4.3.7/build/ssl.sh =================================================================== --- xymon-4.3.7/build/ssl.sh (Revision 1) +++ xymon-4.3.7/build/ssl.sh (Revision 8) @@ -26,6 +26,22 @@ then OSSLLIB=$DIR/lib64 fi + if test -f $DIR/lib/i386-linux-gnu/libcrypto.so + then + OSSLLIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/i386-linux-gnu/libcrypto.a + then + OSSLLIB=$DIR/lib/i386-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libcrypto.so + then + OSSLLIB=$DIR/lib/x86_64-linux-gnu + fi + if test -f $DIR/lib/x86_64-linux-gnu/libcrypto.a + then + OSSLLIB=$DIR/lib/x86_64-linux-gnu + fi done if test "$USEROSSLINC" != ""; then Index: xymon-4.3.7/client/clientupdate.c =================================================================== --- xymon-4.3.7/client/clientupdate.c (Revision 1) +++ xymon-4.3.7/client/clientupdate.c (Revision 8) @@ -199,9 +199,9 @@ /* Update to version "newversion" */ dbgprintf("Opening pipe to 'tar'\n"); - tarpipefd = popen("tar xf -", "w"); + tarpipefd = popen("tar xfh -", "w"); if (tarpipefd == NULL) { - errprintf("Cannot launch 'tar xf -': %s\n", strerror(errno)); + errprintf("Cannot launch 'tar xfh -': %s\n", strerror(errno)); cleanup(inprogressfn, (removeself ? argv[0] : NULL)); return 1; } Index: xymon-4.3.7/client/xymonclient.cfg.DIST =================================================================== --- xymon-4.3.7/client/xymonclient.cfg.DIST (Revision 1) +++ xymon-4.3.7/client/xymonclient.cfg.DIST (Revision 8) @@ -4,6 +4,10 @@ XYMSERVERS="" # IP of multiple Xymon servers. XYMSRV must be "0.0.0.0". CONFIGCLASS="$SERVEROSTYPE" # Default configuration class for logfiles +include /etc/default/xymon-client +MACHINE="$CLIENTHOSTNAME" +MACHINEDOTS="$CLIENTHOSTNAME" + PATH="/bin:/usr/bin:/sbin:/usr/sbin:/etc" # PATH setting for the client scripts. # You normally dont need to modify anything below here