Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37709390
en ru br
Репозитории ALT
5.1: 1.3.0-alt1
4.1: 1.2.2-alt1
www.altlinux.org/Changes

Группа :: Development/Tools
Пакет: tsung

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: tsung-1.3.0-alt1.patch
Скачать

 Makefile.in                    |   98 ++++++++++++++++++++--------------------
 src/lib/snmp_mgr.erl           |    2 +-
 src/lib/snmp_mgr_misc.erl      |    4 +-
 src/log2tsung.pl.in            |    2 +-
 src/tsung/ts_jabber_common.erl |    8 ---
 src/tsung/ts_utils.erl         |   31 ++-----------
 tsung.sh.in                    |    2 +-
 7 files changed, 58 insertions(+), 89 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index fbf1574..4250147 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,11 +70,11 @@ endif
 # installation path
 BINDIR    = $(bindir)
 LIBDIR    = $(libdir)/tsung/bin/
-CONFDIR   = $(datadir)/doc/tsung/examples
 SHARE_DIR = $(datadir)/tsung/
 TEMPLATES_DIR = $(datadir)/$(TEMPLATES_SUBDIR)
 MAN_DIR   = $(datadir)/man/man1/
 DOC_DIR   = $(datadir)/doc/tsung
+CONFDIR   = $(DOC_DIR)/examples
 
 BUILDER_LOG   = /tmp/builder-tsung.log
 
@@ -192,79 +192,79 @@ clean:
 	-rm -f $(TGT_APPFILES) tsung.sh $(PERL_SCRIPTS) $(CONFFILE)
 	-rm -f ebin/*.beam tsung.sh tsung.spec tsung.xml
 
-install: doc boot install_recorder install_controller $(CONFFILE)
+install: install_recorder install_controller $(CONFFILE)
 	-rm -f $(TMP)
 
-	install -d $(TARGETDIR)/priv
-	install -d $(TARGETDIR)/ebin
-	install -d $(TARGETDIR)/src
-	install -d $(TARGETDIR)/include
-	install -d $(LIBDIR)/
-	install -d $(BINDIR)/
+	install -d $(DESTDIR)$(TARGETDIR)/priv
+	install -d $(DESTDIR)$(TARGETDIR)/ebin
+	install -d $(DESTDIR)$(TARGETDIR)/src
+	install -d $(DESTDIR)$(TARGETDIR)/include
+	install -d $(DESTDIR)$(LIBDIR)/
+	install -d $(DESTDIR)$(BINDIR)/
 
-	install -m 0644 $(INC_FILES) $(TARGETDIR)/include/
-	install -m 0644 $(TARGET) $(TARGETDIR)/ebin/
-	install -m 0644 $(LIB_TARGET) $(TARGETDIR)/ebin/
-	install -m 0644 builder.beam $(TARGETDIR)/ebin/
+	install -m 0644 $(INC_FILES) $(DESTDIR)$(TARGETDIR)/include/
+	install -m 0644 $(TARGET) $(DESTDIR)$(TARGETDIR)/ebin/
+	install -m 0644 $(LIB_TARGET) $(DESTDIR)$(TARGETDIR)/ebin/
+	install -m 0644 builder.beam $(DESTDIR)$(TARGETDIR)/ebin/
 
 
-	install -m 0644 $(TGT_APPFILES_E) $(TARGETDIR)/ebin/
-	install -m 0644 $(TGT_APPFILES_P) $(TARGETDIR)/priv/
+	install -m 0644 $(TGT_APPFILES_E) $(DESTDIR)$(TARGETDIR)/ebin/
+	install -m 0644 $(TGT_APPFILES_P) $(DESTDIR)$(TARGETDIR)/priv/
 
 
-	install -m 0644 $(SRC) $(SRC_APPFILES) $(TARGETDIR)/src/
-	echo $(BUILD_OPTIONS_DOT) > $(TARGETDIR)/BUILD_OPTIONS
+	install -m 0644 $(SRC) $(SRC_APPFILES) $(DESTDIR)$(TARGETDIR)/src/
+	echo $(BUILD_OPTIONS_DOT) > $(DESTDIR)$(TARGETDIR)/BUILD_OPTIONS
 
 
 # install the man page & user's manual
-	install -d $(MAN_DIR)
-	install -m 0644 doc/tsung.1 $(MAN_DIR)
-	install -d $(DOC_DIR)/images
-	install -m 0644 $(USERMANUAL) $(DOC_DIR)
-	install -m 0644 $(USERMANUAL_IMG) $(DOC_DIR)/images
+	install -d $(DESTDIR)$(MAN_DIR)
+	install -m 0644 doc/tsung.1 $(DESTDIR)$(MAN_DIR)
+	install -d $(DESTDIR)$(DOC_DIR)/images
+	install -m 0644 $(USERMANUAL) $(DESTDIR)$(DOC_DIR)
+	install -m 0644 $(USERMANUAL_IMG) $(DESTDIR)$(DOC_DIR)/images
 
 # create startup script
-	install -m 0755 tsung.sh $(SCRIPT)
-	install -m 0755 $(PERL_SCRIPTS) $(LIBDIR)/
+	install -m 0755 tsung.sh $(DESTDIR)$(SCRIPT)
+	install -m 0755 $(PERL_SCRIPTS) $(DESTDIR)$(LIBDIR)/
 
-	install -d $(CONFDIR)
-	install -m 0644 $(CONFFILE) $(CONFDIR)/
+	install -d $(DESTDIR)$(CONFDIR)
+	install -m 0644 $(CONFFILE) $(DESTDIR)$(CONFDIR)/
 
-	install -d $(TEMPLATES_DIR)
-	install -m 0644 $(TEMPLATES) $(TEMPLATES_DIR)/
-	install -m 0644 $(DTD) $(SHARE_DIR)/
+	install -d $(DESTDIR)$(TEMPLATES_DIR)
+	install -m 0644 $(TEMPLATES) $(DESTDIR)$(TEMPLATES_DIR)/
+	install -m 0644 $(DTD) $(DESTDIR)$(SHARE_DIR)/
 
 install_recorder:
-	install -d $(RECORDER_TARGETDIR)/priv
-	install -d $(RECORDER_TARGETDIR)/ebin
-	install -d $(RECORDER_TARGETDIR)/src
-	install -d $(RECORDER_TARGETDIR)/include
+	install -d $(DESTDIR)$(RECORDER_TARGETDIR)/priv
+	install -d $(DESTDIR)$(RECORDER_TARGETDIR)/ebin
+	install -d $(DESTDIR)$(RECORDER_TARGETDIR)/src
+	install -d $(DESTDIR)$(RECORDER_TARGETDIR)/include
 
-	install -m 0644 $(INC_FILES) $(RECORDER_TARGETDIR)/include
-	install -m 0644 $(RECORDER_TARGET) $(RECORDER_TARGETDIR)/ebin
+	install -m 0644 $(INC_FILES) $(DESTDIR)$(RECORDER_TARGETDIR)/include
+	install -m 0644 $(RECORDER_TARGET) $(DESTDIR)$(RECORDER_TARGETDIR)/ebin
 
-	install -m 0644 $(RECORDER_TGT_APPFILES_E) $(RECORDER_TARGETDIR)/ebin
-	install -m 0644 $(RECORDER_TGT_APPFILES_P) $(RECORDER_TARGETDIR)/priv
+	install -m 0644 $(RECORDER_TGT_APPFILES_E) $(DESTDIR)$(RECORDER_TARGETDIR)/ebin
+	install -m 0644 $(RECORDER_TGT_APPFILES_P) $(DESTDIR)$(RECORDER_TARGETDIR)/priv
 
-	install -m 0644 $(RECORDER_SRC) $(RECORDER_SRC_APPFILES) $(RECORDER_TARGETDIR)/src
-	@echo $(BUILD_OPTIONS_DOT) > $(RECORDER_TARGETDIR)/BUILD_OPTIONS
+	install -m 0644 $(RECORDER_SRC) $(RECORDER_SRC_APPFILES) $(DESTDIR)$(RECORDER_TARGETDIR)/src
+	@echo $(BUILD_OPTIONS_DOT) > $(DESTDIR)$(RECORDER_TARGETDIR)/BUILD_OPTIONS
 
 install_controller:
-	install -d $(CONTROLLER_TARGETDIR)/priv
-	install -d $(CONTROLLER_TARGETDIR)/ebin
-	install -d $(CONTROLLER_TARGETDIR)/src
-	install -d $(CONTROLLER_TARGETDIR)/include
-	install -m 0644 $(INC_FILES) $(CONTROLLER_TARGETDIR)/include
-	install -m 0644 $(CONTROLLER_TARGET) $(CONTROLLER_TARGETDIR)/ebin
+	install -d $(DESTDIR)$(CONTROLLER_TARGETDIR)/priv
+	install -d $(DESTDIR)$(CONTROLLER_TARGETDIR)/ebin
+	install -d $(DESTDIR)$(CONTROLLER_TARGETDIR)/src
+	install -d $(DESTDIR)$(CONTROLLER_TARGETDIR)/include
+	install -m 0644 $(INC_FILES) $(DESTDIR)$(CONTROLLER_TARGETDIR)/include
+	install -m 0644 $(CONTROLLER_TARGET) $(DESTDIR)$(CONTROLLER_TARGETDIR)/ebin
 
-	install -m 0644 $(CONTROLLER_TGT_APPFILES_E) $(CONTROLLER_TARGETDIR)/ebin
-	install -m 0644 $(CONTROLLER_TGT_APPFILES_P) $(CONTROLLER_TARGETDIR)/priv
+	install -m 0644 $(CONTROLLER_TGT_APPFILES_E) $(DESTDIR)$(CONTROLLER_TARGETDIR)/ebin
+	install -m 0644 $(CONTROLLER_TGT_APPFILES_P) $(DESTDIR)$(CONTROLLER_TARGETDIR)/priv
 
-	install -m 0644 $(CONTROLLER_SRC) $(CONTROLLER_SRC_APPFILES) $(CONTROLLER_TARGETDIR)/src
-	@echo $(BUILD_OPTIONS_DOT) > $(CONTROLLER_TARGETDIR)/BUILD_OPTIONS
+	install -m 0644 $(CONTROLLER_SRC) $(CONTROLLER_SRC_APPFILES) $(DESTDIR)$(CONTROLLER_TARGETDIR)/src
+	@echo $(BUILD_OPTIONS_DOT) > $(DESTDIR)$(CONTROLLER_TARGETDIR)/BUILD_OPTIONS
 
 uninstall:
-	rm -rf $(TARGETDIR) $(SCRIPT)
+	rm -rf $(DESTDIR)$(TARGETDIR) $(DESTDIR)$(SCRIPT)
 
 boot: tsung priv/tsung.boot priv/tsung_recorder.boot priv/tsung_controller.boot
 
diff --git a/src/lib/snmp_mgr.erl b/src/lib/snmp_mgr.erl
index d0edf12..1668af4 100644
--- a/src/lib/snmp_mgr.erl
+++ b/src/lib/snmp_mgr.erl
@@ -43,7 +43,7 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
 
 -include_lib("snmp/include/snmp_types.hrl").
--include_lib("snmp/src/misc/snmp_debug.hrl").
+-include_lib("snmp/include/snmp_debug.hrl").
 -include_lib("snmp/include/STANDARD-MIB.hrl").
 
 -record(state,{dbg         = true,
diff --git a/src/lib/snmp_mgr_misc.erl b/src/lib/snmp_mgr_misc.erl
index dc12834..c7e5ed3 100644
--- a/src/lib/snmp_mgr_misc.erl
+++ b/src/lib/snmp_mgr_misc.erl
@@ -30,7 +30,7 @@
 
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
--include_lib("snmp/src/misc/snmp_debug.hrl").
+-include_lib("snmp/include/snmp_debug.hrl").
 
 -record(mini_mib_elem,{aliasname, oid, type}).
 
@@ -505,7 +505,7 @@ set_pdu(Msg, RePdu) ->
 
 init_usm('version-3', Dir) ->
     ets:new(snmp_agent_table, [set, public, named_table]),
-    snmp_local_db:start_link(Dir, normal, [{verbosity,silence}]),
+    snmpa_local_db:start_link(Dir, normal, [{verbosity,silence}]),
     snmp_generic:variable_set(snmpEngineID, "mgrEngine"),
     snmp_framework_mib:set_engine_boots(1),
     snmp_framework_mib:set_engine_time(1),
diff --git a/src/log2tsung.pl.in b/src/log2tsung.pl.in
index 172662d..4da1508 100644
--- a/src/log2tsung.pl.in
+++ b/src/log2tsung.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # -*- Mode: CPerl -*-
 #
 #  Copyright (C) 2004 Nicolas Niclausse
diff --git a/src/tsung/ts_jabber_common.erl b/src/tsung/ts_jabber_common.erl
index 63a5e5e..db3289f 100644
--- a/src/tsung/ts_jabber_common.erl
+++ b/src/tsung/ts_jabber_common.erl
@@ -356,14 +356,6 @@ message(Dest, #jabber{data=Data, username=User}, Service) when is_list(Data) ->
                     "'><body>",Data, "</body></message>"]).
 
 %%----------------------------------------------------------------------
-%% @spec garbage/1
-%% @depracated use {@link ts_utils:randomstr/1} or
-%%                 {@link ts_utils:randomstr_noflat/1} instead
-%%----------------------------------------------------------------------
-garbage(Size)->
-    ts_utils:urandomstr_noflat(Size).
-
-%%----------------------------------------------------------------------
 %% Func: presence/0
 %%----------------------------------------------------------------------
 presence() ->
diff --git a/src/tsung/ts_utils.erl b/src/tsung/ts_utils.erl
index 4d4ed63..477fa45 100644
--- a/src/tsung/ts_utils.erl
+++ b/src/tsung/ts_utils.erl
@@ -164,31 +164,13 @@ node_to_hostname(Node) ->
     {ok, Hostname}.
 
 to_lower(String)->
-    case check_httpd_old_version() of
-        false ->
-            string:to_lower(String);
-        true  ->
-            httpd_util:to_lower(String)
-    end.
+    string:to_lower(String).
 
 encode_base64(String)->
-    case check_httpd_old_version() of
-        false ->
-            base64:encode_to_string(String);
-        true  ->
-            httpd_util:encode_base64(String)
-    end.
+    base64:encode_to_string(String).
 
 decode_base64(Base64)->
-    case check_httpd_old_version() of
-        false ->
-            base64:decode_to_string(Base64);
-        true ->
-            httpd_util:decode_base64(Base64)
-    end.
-
-%% check erlang version to know if we need to use the old httpd_utils functions
-check_httpd_old_version()-> not release_is_newer_or_eq("5.5.4").
+    base64:decode_to_string(Base64).
 
 % return true if current version of erlang is newer or equal
 release_is_newer_or_eq(Release)->
@@ -201,12 +183,7 @@ release_is_newer_or_eq(Release)->
 %%          these functions will be added to the stdlib)
 %%----------------------------------------------------------------------
 key1search(Tuple,String)->
-    case release_is_newer_or_eq("5.7") of %% should be removed in R13B
-        true ->
-            proplists:get_value(String,Tuple);
-        false ->
-            httpd_util:key1search(Tuple,String)
-    end.
+    proplists:get_value(String,Tuple).
 
 %%----------------------------------------------------------------------
 %% Func: mkey1search/2
diff --git a/tsung.sh.in b/tsung.sh.in
index 0eb5953..7626176 100755
--- a/tsung.sh.in
+++ b/tsung.sh.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 UNAME=`uname`
 case $UNAME in








 






	дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005,
	Andrew Avramenko aka liks © 2007-2008

	текущий майнтейнер: Michael Shigorin