From 8387179ff9dcd7c4426fca2a2e6420178315141b Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 3 May 2024 13:43:55 +0200 Subject: [PATCH 1/4] fix tentacle no root pandora_enterprise#13566wq --- tentacle/tentacle_server | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server index b6d6ae7b08..c9fa8604b8 100755 --- a/tentacle/tentacle_server +++ b/tentacle/tentacle_server @@ -1784,12 +1784,6 @@ sub check_ssleay_version { # Main ################################################################################ -# Never run as root -if ($> == 0 && $^O ne 'MSWin32') { - print ("Error: for safety reasons $0 cannot be run with root privileges.\n"); - exit 1; -} - # Parse command line options parse_options (); From d52be428054af47ac51e08a0995d174eba6e1ee0 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 7 May 2024 20:18:24 +0200 Subject: [PATCH 2/4] fix tentacle no root pandora_enterprise#13566 --- pandora_agents/pc/tentacle_server | 6 ------ pandora_agents/unix/tentacle_server | 6 ------ pandora_server/NetBSD/tentacle_server | 6 ------ pandora_server/bin/tentacle_server | 6 ------ 4 files changed, 24 deletions(-) diff --git a/pandora_agents/pc/tentacle_server b/pandora_agents/pc/tentacle_server index 38bde23d5e..341ba49634 100755 --- a/pandora_agents/pc/tentacle_server +++ b/pandora_agents/pc/tentacle_server @@ -1757,12 +1757,6 @@ sub check_ssleay_version { # Main ################################################################################ -# Never run as root -if ($> == 0 && $^O ne 'MSWin32') { - print ("Error: for safety reasons $0 cannot be run with root privileges.\n"); - exit 1; -} - # Parse command line options parse_options (); diff --git a/pandora_agents/unix/tentacle_server b/pandora_agents/unix/tentacle_server index 38bde23d5e..341ba49634 100755 --- a/pandora_agents/unix/tentacle_server +++ b/pandora_agents/unix/tentacle_server @@ -1757,12 +1757,6 @@ sub check_ssleay_version { # Main ################################################################################ -# Never run as root -if ($> == 0 && $^O ne 'MSWin32') { - print ("Error: for safety reasons $0 cannot be run with root privileges.\n"); - exit 1; -} - # Parse command line options parse_options (); diff --git a/pandora_server/NetBSD/tentacle_server b/pandora_server/NetBSD/tentacle_server index 38bde23d5e..341ba49634 100755 --- a/pandora_server/NetBSD/tentacle_server +++ b/pandora_server/NetBSD/tentacle_server @@ -1757,12 +1757,6 @@ sub check_ssleay_version { # Main ################################################################################ -# Never run as root -if ($> == 0 && $^O ne 'MSWin32') { - print ("Error: for safety reasons $0 cannot be run with root privileges.\n"); - exit 1; -} - # Parse command line options parse_options (); diff --git a/pandora_server/bin/tentacle_server b/pandora_server/bin/tentacle_server index 38bde23d5e..341ba49634 100755 --- a/pandora_server/bin/tentacle_server +++ b/pandora_server/bin/tentacle_server @@ -1757,12 +1757,6 @@ sub check_ssleay_version { # Main ################################################################################ -# Never run as root -if ($> == 0 && $^O ne 'MSWin32') { - print ("Error: for safety reasons $0 cannot be run with root privileges.\n"); - exit 1; -} - # Parse command line options parse_options (); From d80376d57accde9f500b7ff85715a8e3e2573fa2 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 8 May 2024 10:55:11 +0200 Subject: [PATCH 3/4] fix tentacle no root pandora_enterprise#13566 --- .../unix/man/man1/tentacle_server.1.gz | Bin 0 -> 1309 bytes pandora_agents/unix/pandora_agent.redhat.spec | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 pandora_agents/unix/man/man1/tentacle_server.1.gz diff --git a/pandora_agents/unix/man/man1/tentacle_server.1.gz b/pandora_agents/unix/man/man1/tentacle_server.1.gz new file mode 100644 index 0000000000000000000000000000000000000000..eea67284be92f11ac83639c5c5fb9648e2629014 GIT binary patch literal 1309 zcmV+&1>*W2iwFqFhU!ZK19W9>bYWv`WnXh;a&~2ME-?U=R&7rkM-cvgzhcCf+EF-c z8rn3issM2mBwk$3N)rhQtux&M?xpgH|m{t@lO<_TeD~wyu?# z#lo}vh@OCFf7vEzYy964_MJGI@)^VQZ8ujY)z^~ z{wC;BNt#r1xll&?dJUf&xR$R;o4`(?6j8Cg(I`le3Uuw3?<3h?@`J%2RI&?tE^zE~ zDpEF$@_uFA>}fPBjZ{E6g~H0#q2$sU!;vyV(|y}C)+H)zPM`^7Cmp0pk`{Usupox? zW;om*_DO-P8GC(W5{sBG*P2wZ^lMv}(s=0>EE6MZ8TiuaCM3p;mBi-yrgbTE;n&A7 zh8aT0w>pTtja|h!GoGuq3QxpZb6D880cZ?#>lA%FD`KD{HRXy%!gk}d=O?(4&Kd_u z7GfH+tD@WCd2vF=)caQhZUuc-DgYi`)TXRjB-jViSKFdeLohLwRe(q=-f&3z(ng$8 zg%~5Lz|PT3ttu*Pi-m>vSVk+JdL1z1AvEvy_BK;J%YA1g%Gr~a$z)%|p)T<7Y1|dG zUP9*sJG#GkjGyXxoXK5^8#mO*tUL4e7?gSZbQxhatS42NN0*`Yr0n)qlx}gtc!+?D0^!n zq7HJjS2m9q-FNQuFRaCfY6 z{83ksm+ua5V`$9rI+G@5CX<~ajb+APZhxBm&h;D2|7kUcoIcn%kf;Z1gPpT7g5Kj=-6Fv~ z6U+I7NYeiFabh8Btg>6ERvPh0DZg%o4-qctdd<-U|Lxi~Ji|~41dL$?T3kC@%JW-* zOMo0PfupJQTNJH?7VNDiLBG_z&HC+}?h>!7SxRm_h@D-U+R>N8v+?N&clu-u!;`1i z_Z7Yz)O3XjdGq$*_uojKJwEqB-Nc7wR=jW>#jB9&XQJ^OdpkTk`cc3;AV1tEKNazN zw@}a6u)cr#KNXqrDdU(oT*rf3e1h literal 0 HcmV?d00001 diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index f379e25a34..2f9596eebb 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -53,11 +53,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew @@ -164,9 +166,11 @@ exit 0 %defattr(755,root,root) /usr/bin/pandora_agent_exec /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/rc.d/init.d/pandora_agent_daemon %defattr(644,root,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_agent From ef9af1562f2ecac37654fecb033d76a3d7f7f34e Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 8 May 2024 12:16:54 +0200 Subject: [PATCH 4/4] fix tentacle no root pandora_enterprise#13566 --- extras/fedora_official_specs/pandorafms-agent.spec | 4 ++++ pandora_agents/pc/pandora_agent.redhat.spec | 5 +++++ pandora_agents/pc/pandora_agent.spec | 5 +++++ pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 4 ++++ pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 4 ++++ pandora_agents/unix/pandora_agent.redhat_bin.spec | 4 ++++ pandora_agents/unix/pandora_agent.spec | 5 +++++ 7 files changed, 31 insertions(+) diff --git a/extras/fedora_official_specs/pandorafms-agent.spec b/extras/fedora_official_specs/pandorafms-agent.spec index 2603777a1e..9abc41c042 100644 --- a/extras/fedora_official_specs/pandorafms-agent.spec +++ b/extras/fedora_official_specs/pandorafms-agent.spec @@ -38,9 +38,11 @@ mkdir -p %{buildroot}/usr/share/man/man1/ install -m 0755 pandora_agent %{buildroot}%{_bindir}/pandora_agent install -m 0755 pandora_agent_exec %{buildroot}%{_bindir}/pandora_agent_exec install -m 0755 tentacle_client %{buildroot}%{_bindir}/tentacle_client +install -m 0755 tentacle_server %{buildroot}%{_bindir}/tentacle_server install -m 0755 pandora_agent_daemon %{buildroot}/etc/init.d/pandora_agent_daemon install -m 0644 man/man1/pandora_agent.1.gz %{buildroot}/usr/share/man/man1/pandora_agent.1.gz install -m 0644 man/man1/tentacle_client.1.gz %{buildroot}/usr/share/man/man1/tentacle_client.1.gz +install -m 0644 man/man1/tentacle_server.1.gz %{buildroot}/usr/share/man/man1/tentacle_server.1.gz install -m 0600 Linux/pandora_agent.conf %{buildroot}/etc/pandora/pandora_agent.conf install -d -m 0755 %{buildroot}/etc/pandora/plugins install -d -m 0755 %{buildroot}/etc/pandora/collections @@ -81,6 +83,7 @@ fi /usr/bin/pandora_agent /usr/bin/pandora_agent_exec /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/init.d/pandora_agent_daemon %defattr(-,pandora,root,770) @@ -96,6 +99,7 @@ fi %doc /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz %changelog * Sun Feb 23 2014 Sancho Lerena - 5.0 diff --git a/pandora_agents/pc/pandora_agent.redhat.spec b/pandora_agents/pc/pandora_agent.redhat.spec index ce60c8841f..ba98fcac02 100644 --- a/pandora_agents/pc/pandora_agent.redhat.spec +++ b/pandora_agents/pc/pandora_agent.redhat.spec @@ -45,12 +45,14 @@ mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ # Checking old config file (if exists) if [ -f /etc/pandora/pandora_agent.conf ] ; then @@ -113,6 +115,7 @@ rm -Rf /var/log/pandora/pandora_agent* 2> /dev/null rm -Rf /usr/share/pandora_agent rm -Rf /usr/share/man/man1/pandora_agent.1.gz rm -Rf /usr/share/man/man1/tentacle_client.1.gz +rm -Rf /usr/share/man/man1/tentacle_server.1.gz exit 0 %files @@ -125,6 +128,7 @@ exit 0 %defattr(755,pandora,root) /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/init.d/pandora_agent_daemon %docdir %{prefix}/pandora_agents/docs %{prefix}/pandora_agent @@ -132,4 +136,5 @@ exit 0 %defattr(644,pandora,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz diff --git a/pandora_agents/pc/pandora_agent.spec b/pandora_agents/pc/pandora_agent.spec index 5ad481315a..08a1f5c536 100644 --- a/pandora_agents/pc/pandora_agent.spec +++ b/pandora_agents/pc/pandora_agent.spec @@ -46,12 +46,14 @@ mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ # Checking old config file (if exists) if [ -f /etc/pandora/pandora_agent.conf ] ; then @@ -115,6 +117,7 @@ rm -Rf /var/log/pandora/pandora_agent* 2> /dev/null rm -Rf /usr/share/pandora_agent rm -Rf /usr/share/man/man1/pandora_agent.1.gz rm -Rf /usr/share/man/man1/tentacle_client.1.gz +rm -Rf /usr/share/man/man1/tentacle_server.1.gz exit 0 %files @@ -127,6 +130,7 @@ exit 0 %defattr(755,pandora,root) /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/init.d/pandora_agent_daemon %docdir %{prefix}/pandora_agents/docs %{prefix}/pandora_agent @@ -134,4 +138,5 @@ exit 0 %defattr(644,pandora,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index b13d18455c..23c29cb545 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -55,11 +55,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew @@ -161,9 +163,11 @@ exit 0 %defattr(755,root,root) /usr/bin/pandora_agent_exec /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/rc.d/init.d/pandora_agent_daemon %defattr(644,root,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_agent diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 634829a853..baae9f1ed1 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -55,11 +55,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ #cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew @@ -150,8 +152,10 @@ exit 0 %defattr(755,root,root) /usr/bin/pandora_agent_exec /usr/bin/tentacle_client +/usr/bin/tentacle_server %defattr(644,root,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_agent diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index ddffff177d..75a4658c68 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -53,11 +53,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew @@ -159,9 +161,11 @@ exit 0 %defattr(755,root,root) /usr/bin/pandora_agent_exec /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/rc.d/init.d/pandora_agent_daemon %defattr(644,root,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_agent diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 6a2a4c8c2d..2e9c53428f 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -46,12 +46,14 @@ mkdir -p $RPM_BUILD_ROOT/var/log/pandora/ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_server $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/init.d/pandora_agent_daemon cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ +cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/ cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/Linux/pandora_agent.conf $RPM_BUILD_ROOT/usr/share/pandora_agent/pandora_agent.conf.rpmnew @@ -147,6 +149,7 @@ rm -Rf /var/log/pandora/pandora_agent* 2> /dev/null rm -Rf /usr/share/pandora_agent rm -Rf /usr/share/man/man1/pandora_agent.1.gz rm -Rf /usr/share/man/man1/tentacle_client.1.gz +rm -Rf /usr/share/man/man1/tentacle_server.1.gz exit 0 %postun @@ -165,6 +168,7 @@ rm -Rf /etc/logrotate.d/pandora_agent %defattr(755,pandora,root) /usr/bin/tentacle_client +/usr/bin/tentacle_server /etc/init.d/pandora_agent_daemon %docdir %{prefix}/pandora_agents/docs %{prefix}/pandora_agent @@ -172,4 +176,5 @@ rm -Rf /etc/logrotate.d/pandora_agent %defattr(644,pandora,root) /usr/share/man/man1/pandora_agent.1.gz /usr/share/man/man1/tentacle_client.1.gz +/usr/share/man/man1/tentacle_server.1.gz