'kimheino pushed to munin (f28). "Merge remote-tracking branch 'origin/master' into el6 (..more)"'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    kimheino pushed to munin (f28). "Merge remote-tracking branch 'origin/master' into el6 (..more)"
From:       notifications () fedoraproject ! org
Date:       2018-08-24 19:47:53
Message-ID: 20180824194753.217F362C9974 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

Notification time stamped 2018-08-24 19:44:35 UTC

From 2a2324a046b0d127b13183d5f06ad7f5fc10e82d Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Apr 15 2012 21:13:29 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


Conflicts:
	.gitignore
	munin.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 3d5c7bd..f145d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,7 @@
 /munin-1.4.5-no-such-object.patch
 /munin-1.4.6.tar.gz
 /munin-1.4.7.tar.gz
+<<<<<<< HEAD
 /munin-1.4.7.tar.gz.sha256sum
+=======
+>>>>>>> origin/master
diff --git a/munin-1.4.6.tar.gz.sha256sum b/munin-1.4.6.tar.gz.sha256sum
deleted file mode 100644
index 5925a3c..0000000
--- a/munin-1.4.6.tar.gz.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6  munin-1.4.6.tar.gz
diff --git a/munin-1.4.7.tar.gz.sha256sum b/munin-1.4.7.tar.gz.sha256sum
new file mode 100644
index 0000000..0e7c0c9
--- /dev/null
+++ b/munin-1.4.7.tar.gz.sha256sum
@@ -0,0 +1 @@
+9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af  munin-1.4.7.tar.gz
diff --git a/munin-node.logrotate b/munin-node.logrotate
index 54e59ac..05e8105 100644
--- a/munin-node.logrotate
+++ b/munin-node.logrotate
@@ -5,5 +5,5 @@
 	compress
 	copytruncate
 	notifempty
-	create 640 root adm
+	create 644 munin munin
 }
diff --git a/munin-node.service-privatetmp b/munin-node.service-privatetmp
new file mode 100644
index 0000000..4d0351a
--- /dev/null
+++ b/munin-node.service-privatetmp
@@ -0,0 +1,12 @@
+[Unit]
+Description=Munin Node Server.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/munin/munin-node.pid
+ExecStart=/usr/sbin/munin-node
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/munin.spec b/munin.spec
index 976a45c..d01f0fa 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.4.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -22,6 +22,7 @@ Source6: munin-1.2.6-postfix-config
 Source7: munin-1.4.5-df-config
 Source8: munin-node.service
 Source9: %{name}.conf
+Source11: munin-node.service-privatetmp
 
 BuildArchitectures: noarch
 
@@ -34,13 +35,20 @@ BuildRequires: perl-Net-Server
 BuildRequires: perl-Net-SSLeay
 BuildRequires: perl-Net-SNMP
 
-# java buildrequires on fedora
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
+# java buildrequires on fedora < 17 and rhel 
+%if 0%{?rhel} > 4 || 0%{?fedora} < 17
 BuildRequires: java-1.6.0-devel
 BuildRequires: mx4j
 BuildRequires: jpackage-utils
 %endif
 
+# java buildrequires on fedora 17 and higher
+%if 0%{?fedora} > 16
+BuildRequires: java-1.7.0-devel
+BuildRequires: mx4j
+BuildRequires: jpackage-utils
+%endif
+
 %if 0%{?rhel} > 6 || 0%{?fedora} > 15
 BuildRequires: systemd-units
 %endif
@@ -134,7 +142,7 @@ java-plugins for munin-node.
 
 %prep
 %setup -q
-%patch1 -p1 
+%patch1 -p1
 
 %if 0%{?rhel} < 6 && 0%{?fedora} < 11
 %patch2 -p0
@@ -143,7 +151,6 @@ java-plugins for munin-node.
 %build
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
 export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath \
                mx4j):$CLASSPATH
-export JAVALIBDIR=/usr/share/java/
 %endif
 make    CONFIG=dists/redhat/Makefile.config
 
@@ -176,8 +183,18 @@ sed -i 's,/etc/munin/munin-conf.d,/etc/munin/conf.d,' \
%{buildroot}/etc/munin/mun  #
 %if 0%{?rhel} > 6 || 0%{?fedora} > 15
 mkdir -p %{buildroot}/lib/systemd/system/
+%endif
+# Fedora 17 and higer uses privatetmp
+%if 0%{?fedora} > 16
+install -m 0644 %{SOURCE11} %{buildroot}/lib/systemd/system/munin-node.service
+%endif
+
+%if 0%{?fedora} > 15 && 0%{?fedora} < 17
+# Fedora 16 does not use privatetmp
 install -m 0644 %{SOURCE8} %{buildroot}/lib/systemd/system/munin-node.service
-%else
+%endif
+%if 0%{?rhel} > 4 || 0%{?fedora} < 16
+# Fedora 15 and rhel use sysvinit
 mkdir -p %{buildroot}/etc/rc.d/init.d
 cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > \
%{buildroot}/etc/rc.d/init.d/munin-node  chmod 755 \
%{buildroot}/etc/rc.d/init.d/munin-node @@ -217,6 +234,8 @@ install -m 0644 \
%{SOURCE4} %{buildroot}/etc/logrotate.d/munin  install -m 0644 %{SOURCE6} \
%{buildroot}/etc/munin/plugin-conf.d/postfix  # install df config to exclude fses we \
shouldn't try and monitor  install -m 0644 %{SOURCE7} \
%{buildroot}/etc/munin/plugin-conf.d/df +# Create for BZ 786030
+touch %{buildroot}/var/lib/munin/plugin-state/yum.state
 
 # Use system font
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSansMono.ttf
@@ -236,11 +255,15 @@ useradd -r -g munin -d /var/lib/munin -s /sbin/nologin \
 exit 0
 
 %post node
+# sysvinit only in f15 and older and epel
+%if 0%{?fedora} < 16 || 0%{?rhel} > 4
 /sbin/chkconfig --add munin-node
+%endif
 # Only run configure on a new install, not an upgrade.
 if [ "$1" = "1" ]; then
      /usr/sbin/munin-node-configure --shell 2> /dev/null | sh >& /dev/null || :
 fi
+test "$1" = "2" && mv /etc/munin/plugins /etc/munin/plugins.bak || :
 
 %preun node
 %if 0%{?rhel} > 6 || 0%{?fedora} > 15
@@ -251,7 +274,12 @@ test "$1" != 0 || /sbin/chkconfig --del munin-node
 %endif
 
 %postun node
-find /etc/munin/plugins/ -maxdepth 1 -type l -print0 |xargs -0 rm
+if [ "$1" = "0" ]; then
+     find /etc/munin/plugins/ -maxdepth 1 -type l -print0 |xargs -0 rm || :
+fi
+
+%posttrans node
+test "$1" = "0" && mv /etc/munin/plugins.bak /etc/munin/plugins || :
 
 #
 # main package scripts
@@ -315,6 +343,7 @@ exit 0
 %dir /etc/munin
 %attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
+%attr(-, munin, munin) /var/lib/munin/plugin-state/yum.state
 %if 0%{?rhel} > 4 || 0%{?fedora} > 6
 %exclude %{_datadir}/munin/plugins/jmx_
 %endif
@@ -346,11 +375,30 @@ exit 0
 
 
 %changelog
+* Sun Apr 15 2012 Kevin Fenzi <kevin@scrye.com> - 1.4.7-2
+- Fix node postun from messing up plugins on upgrade. Works around bug #811867
+
 * Wed Mar 14 2012 D. Johnson <fenris02@fedoraproject.org> - 1.4.7-1
 - updated for 1.4.7 release
 
+* Wed Feb 22 2012 Kevin Fenzi <kevin@scrye.com> 1.4.6-8
+- Build against java-1.7.0 now. Fixes bug #796345
+
+* Tue Jan 31 2012 D. Johnson <fenris02@fedoraproject.org> - 1.4.6-7
+- Create state file for yum-plugin. Fixes BZ #786030.
+
+* Fri Jan 20 2012 Kevin Fenzi <kevin@scrye.com> - 1.4.6-6
+- Add PrivateTmp=true to systemd unit file. Fixes bug #782512
+- Change logrotate to use munin user. Fixes bug #771017
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - \
1.4.6-5.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct 17 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.6-4.3
+- Rebuild for java 1.6.0 downgrade (fesco ticket 663)
+
 * Sat Aug 27 2011 Kevin Fenzi <kevin@scrye.com> - 1.4.6-4.1
-- Add patch to run restorecon in the sysvinit script. 
+- Add patch to run restorecon in the sysvinit script.
 - This doesn't matter on f16+
 
 * Sat Aug 20 2011 D. Johnson <fenris02@fedoraproject.org> - 1.4.6-4
diff --git a/sources b/sources
index 187630f..d3f0d40 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 bb61f2022d215e8a3bbe4a7a4b77bc43  munin-1.4.7.tar.gz
-76c435790a05cfa0615410cd9de65fa0  munin-1.4.7.tar.gz.sha256sum


	https://src.fedoraproject.org/rpms/munin/c/2a2324a046b0d127b13183d5f06ad7f5fc10e82d?branch=f28
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/SF5NHWSQHOSOU5LKC52MBJOPLP6LYIHY/



[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic