Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > main-release-src > by-pkgid > 2ca80f2484c5c5f7b8c9dfb2a9f675fa > files > 2

mmc-core-3.0.0-1mdv2010.1.src.rpm

diff -Naur mmc-core-3.0.0/agent/conf/plugins/base.ini mmc-core-3.0.0.oden/agent/conf/plugins/base.ini
--- mmc-core-3.0.0/agent/conf/plugins/base.ini	2010-04-22 11:24:58.000000000 +0200
+++ mmc-core-3.0.0.oden/agent/conf/plugins/base.ini	2010-04-27 12:32:07.612421449 +0200
@@ -54,7 +54,7 @@
 # group gid number start
 gidStart = 10000
 # LDAP log file path
-logfile = /var/log/ldap.log
+logfile = /var/log/ldap/ldap.log
 # FDS log file path
 # logfile = /opt/fedora-ds/slapd-hostname/logs/access
 
diff -Naur mmc-core-3.0.0/agent/contrib/monit/mmc-agent mmc-core-3.0.0.oden/agent/contrib/monit/mmc-agent
--- mmc-core-3.0.0/agent/contrib/monit/mmc-agent	2009-03-19 14:11:13.000000000 +0100
+++ mmc-core-3.0.0.oden/agent/contrib/monit/mmc-agent	2010-04-27 12:36:39.573328545 +0200
@@ -3,7 +3,7 @@
 
 check process mmc-agent
    with pidfile "/var/run/mmc-agent.pid"
-   start program = "/etc/init.d/mmc-agent start"
-   stop program  = "/etc/init.d/mmc-agent stop"
+   start program = "/etc/rc.d/init.d/mmc-agent start"
+   stop program  = "/etc/rc.d/init.d/mmc-agent stop"
    if failed port 7080 type tcpssl then restart
    if 5 restarts within 5 cycles then timeout
diff -Naur mmc-core-3.0.0/agent/Makefile mmc-core-3.0.0.oden/agent/Makefile
--- mmc-core-3.0.0/agent/Makefile	2010-04-19 13:48:17.000000000 +0200
+++ mmc-core-3.0.0.oden/agent/Makefile	2010-04-27 12:48:39.026234038 +0200
@@ -21,12 +21,12 @@
 
 # General Makefile variables
 DESTDIR = 
-PREFIX = /usr/local
+PREFIX = /usr
 SBINDIR = $(PREFIX)/sbin
 BINDIR= $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib/mmc
 ETCDIR = /etc/mmc
-INITDIR = /etc/init.d
+INITDIR = /etc/rc.d/init.d
 INSTALL = $(shell which install)
 SED = $(shell which sed)
 
@@ -59,12 +59,12 @@
 	-[ -d $(DESTDIR)$(ETCDIR) ] && mv -f $(DESTDIR)$(ETCDIR) $(DESTDIR)$(ETCDIR)$(BACKUP)
 	@echo ""
 	@echo "Creating directories..."
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(BINDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIRBACKUP)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(PYTHON_PREFIX)
 
 	@echo ""
 	@echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)"
@@ -73,26 +73,26 @@
 	@echo ""
 	@echo "Install LIBDIRBACKUP in $(DESTDIR)$(LIBDIRBACKUP)"
 
-	$(INSTALL) $(LIBFILESBACKUP) -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP)
+	$(INSTALL) $(LIBFILESBACKUP) -m 755 $(DESTDIR)$(LIBDIRBACKUP)
 
 	@echo ""
 	@echo "Install SBINFILES in $(DESTDIR)$(SBINDIR)"
-	$(INSTALL) $(SBINFILES) -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
+	$(INSTALL) $(SBINFILES) -m 755 $(DESTDIR)$(SBINDIR)
 
 	@echo ""
 	@echo "Install BINFILES in $(DESTDIR)$(BINDIR)"
-	$(INSTALL) $(BINFILES) -m 755 -o root -g root $(DESTDIR)$(BINDIR)
+	$(INSTALL) $(BINFILES) -m 755 $(DESTDIR)$(BINDIR)
 
 	@echo ""
 	@echo "Install CONFILES in $(DESTDIR)$(ETCDIR)"
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/agent
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/agent/keys
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/plugins
-	$(INSTALL) conf/agent/config.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/agent
-	$(INSTALL) conf/agent/keys/* -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/agent/keys
-	$(INSTALL) conf/plugins/* -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(INITDIR)
-	$(INSTALL) -m 755 -o root -g root init.d/mmc-agent $(DESTDIR)$(INITDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/agent
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/agent/keys
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/plugins
+	$(INSTALL) conf/agent/config.ini -m 600 $(DESTDIR)$(ETCDIR)/agent
+	$(INSTALL) conf/agent/keys/* -m 600 $(DESTDIR)$(ETCDIR)/agent/keys
+	$(INSTALL) conf/plugins/* -m 600 $(DESTDIR)$(ETCDIR)/plugins
+	$(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)
+	$(INSTALL) -m 755 init.d/mmc-agent $(DESTDIR)$(INITDIR)
 	$(SED) -i 's!^path[ \t].*$$!path = $(LIBDIR)/backup-tools!' $(DESTDIR)$(ETCDIR)/plugins/base.ini
 	$(SED) -i 's!##SBINDIR##!$(SBINDIR)!' $(DESTDIR)$(INITDIR)/mmc-agent
 
diff -Naur mmc-core-3.0.0/agent/mmc/agent.py mmc-core-3.0.0.oden/agent/mmc/agent.py
--- mmc-core-3.0.0/agent/mmc/agent.py	2010-03-02 14:53:31.000000000 +0100
+++ mmc-core-3.0.0.oden/agent/mmc/agent.py	2010-04-27 12:41:48.062265875 +0200
@@ -331,7 +331,7 @@
     # Test if mmcagent has been already launched in daemon mode
     if os.path.isfile(config.pidfile):
         print config.pidfile+" pid already exist. Maybe mmc-agent is already running\n"
-        print "use /etc/init.d script to stop and relaunch it"
+        print "use /etc/rc.d/init.d script to stop and relaunch it"
         sys.exit(0)
 
     # do the UNIX double-fork magic, see Stevens' "Advanced
diff -Naur mmc-core-3.0.0/agent/openldap-check-password/Makefile mmc-core-3.0.0.oden/agent/openldap-check-password/Makefile
--- mmc-core-3.0.0/agent/openldap-check-password/Makefile	2009-12-17 17:20:27.000000000 +0100
+++ mmc-core-3.0.0.oden/agent/openldap-check-password/Makefile	2010-04-27 12:48:39.024203541 +0200
@@ -20,22 +20,26 @@
 # along with MMC.  If not, see <http://www.gnu.org/licenses/>.
 
 CONFFILE = /etc/openldap/mmc-check-password.conf
+CFLAGS = -g -O2 -Wall -fpic
+DESTDIR = 
 
 all: mmc-check-password
 
 mmc-check-password.o:
-	$(CC) -g -O2 -Wall -fpic -c -I/usr/include/openldap/include -I/usr/include/openldap/slapd -DCONFIG_FILE=\"$(CONFFILE)\" mmc-check-password.c
+	$(CC) $(CFLAGS) -c -I/usr/include/openldap/include -I/usr/include/openldap/slapd -DCONFIG_FILE=\"$(CONFFILE)\" mmc-check-password.c
 
 mmc-check-password: clean mmc-check-password.o
-	$(CC) -shared -o mmc-check-password.so mmc-check-password.o
+	$(CC) $(CFLAGS) -shared -Wl,-soname=mmc-check-password.so -o \
+	mmc-check-password.so mmc-check-password.o
 
 install: mmc-check-password
 	# FIXME: don't know how to make it better ...
-	-[ -d /usr/lib/openldap ] && \
-	$(INSTALL) mmc-check-password.so -m 755 -o root -g root /usr/lib/openldap/
-	-[ -d /usr/lib64/openldap ] && \
-	$(INSTALL) mmc-check-password.so -m 755 -o root -g root /usr/lib64/openldap/
-	$(INSTALL) mmc-check-password.conf -m 644 -o root -g root $(CONFFILE)
+	-[ -d $(DESTDIR)/usr/lib/openldap ] && \
+	$(INSTALL) mmc-check-password.so -m 755 $(DESTDIR)/usr/lib/openldap/
+	-[ -d $(DESTDIR)/usr/lib64/openldap ] && \
+	$(INSTALL) mmc-check-password.so -m 755 $(DESTDIR)/usr/lib64/openldap/
+	$(INSTALL) -d -m 755 $(DESTDIR)/etc/openldap
+	$(INSTALL) mmc-check-password.conf -m 644 $(DESTDIR)$(CONFFILE)
 
 clean:
 	$(RM) mmc-check-password.o mmc-check-password.so *~
diff -Naur mmc-core-3.0.0/Makefile mmc-core-3.0.0.oden/Makefile
--- mmc-core-3.0.0/Makefile	2009-09-25 15:15:35.000000000 +0200
+++ mmc-core-3.0.0.oden/Makefile	2010-04-27 12:48:39.029235583 +0200
@@ -21,11 +21,11 @@
 
 # General Makefile variables
 DESTDIR = 
-PREFIX = /usr/local
+PREFIX = /usr
 SBINDIR = $(PREFIX)/sbin
 LIBDIR = $(PREFIX)/lib/mmc
 ETCDIR = /etc/mmc
-INITDIR = /etc/init.d
+INITDIR = /etc/rc.d/init.d
 INSTALL = $(shell which install)
 SED = $(shell which sed)
 
@@ -44,9 +44,6 @@
 # web part
 DATADIR = $(PREFIX)/share/mmc
 CP = $(shell which cp)
-CHOWN = $(shell which chown)
-CHGRP = $(shell which chgrp)
-HTTPDUSER = www-data
 RM = $(shell which rm)
 APACHE_CONF = confs/apache/mmc.conf
 
@@ -71,13 +68,13 @@
 	gen-doc/create.sh
 
 clean_mo:
-	sh scripts/clean_mo.sh
+	sh web/scripts/clean_mo.sh
 
 build_mo:
-	sh scripts/build_mo.sh
+	sh web/scripts/build_mo.sh
 
 build_pot:
-	sh scripts/build_pot.sh
+	sh web/scripts/build_pot.sh
 
 apache_conf:
 	$(SED) 's!###DATADIR###!$(DATADIR)!' $(APACHE_CONF).tmpl > $(APACHE_CONF)
@@ -96,11 +93,11 @@
 	-[ -d $(DESTDIR)$(ETCDIR) ] && mv -f $(DESTDIR)$(ETCDIR) $(DESTDIR)$(ETCDIR)$(BACKUP)
 	@echo ""
 	@echo "Creating directories..."
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIRBACKUP)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(PYTHON_PREFIX)
 
 	@echo ""
 	@echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)"
@@ -109,33 +106,31 @@
 	@echo ""
 	@echo "Install LIBDIRBACKUP in $(DESTDIR)$(LIBDIRBACKUP)"
 
-	$(INSTALL) $(LIBFILESBACKUP) -m 755 -o root -g root $(DESTDIR)$(LIBDIRBACKUP)
+	$(INSTALL) $(LIBFILESBACKUP) -m 755 $(DESTDIR)$(LIBDIRBACKUP)
 
 	@echo ""
 	@echo "Install SBINFILES in $(DESTDIR)$(SBINDIR)"
-	$(INSTALL) $(SBINFILES) -m 755 -o root -g root $(DESTDIR)$(SBINDIR)
+	$(INSTALL) $(SBINFILES) -m 755 $(DESTDIR)$(SBINDIR)
 
 	@echo ""
 	@echo "Install CONFILES in $(DESTDIR)$(ETCDIR)"
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/agent
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/agent/keys
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/plugins
-	$(INSTALL) conf/agent/config.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/agent
-	$(INSTALL) conf/agent/keys/* -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/agent/keys
-	$(INSTALL) conf/plugins/* -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(INITDIR)
-	$(INSTALL) -m 755 -o root -g root init.d/mmc-agent $(DESTDIR)$(INITDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/agent
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/agent/keys
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/plugins
+	$(INSTALL) conf/agent/config.ini -m 600 $(DESTDIR)$(ETCDIR)/agent
+	$(INSTALL) conf/agent/keys/* -m 600 $(DESTDIR)$(ETCDIR)/agent/keys
+	$(INSTALL) conf/plugins/* -m 600 $(DESTDIR)$(ETCDIR)/plugins
+	$(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)
+	$(INSTALL) -m 755 init.d/mmc-agent $(DESTDIR)$(INITDIR)
 	$(SED) -i 's!^path[ \t].*$$!path = $(LIBDIR)/backup-tools!' $(DESTDIR)$(ETCDIR)/plugins/base.ini
 	$(SED) -i 's!##SBINDIR##!$(SBINDIR)!' $(DESTDIR)$(INITDIR)/mmc-agent
 
 	@echo ""
 	@echo "Installing mmc-web in $(DESTDIR)$(DATADIR)"
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(DATADIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(DATADIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)
 	$(CP) -R $(FILESTOINSTALL) $(DESTDIR)$(DATADIR)
-	$(CHOWN) -R root $(DESTDIR)$(DATADIR)
-	$(CHGRP) -R root $(DESTDIR)$(DATADIR)
-	$(INSTALL) confs/mmc.ini -m 640 -o root -g $(HTTPDUSER) $(DESTDIR)$(ETCDIR)
+	$(INSTALL) confs/mmc.ini -m 640 $(DESTDIR)$(ETCDIR)
 	$(SED) -i 's!^rootfs[ \t].*$$!rootfs = $(DATADIR)/!' $(DESTDIR)$(ETCDIR)/mmc.ini
 	$(SED) -i 's!^rootfsmodules[ \t].*$$!rootfsmodules = $(DATADIR)/modules/!' $(DESTDIR)$(ETCDIR)/mmc.ini
 	find $(DESTDIR)$(DATADIR) -type f -name *.po -exec rm -f {} \;
diff -Naur mmc-core-3.0.0/web/Makefile mmc-core-3.0.0.oden/web/Makefile
--- mmc-core-3.0.0/web/Makefile	2008-05-20 14:24:45.000000000 +0200
+++ mmc-core-3.0.0.oden/web/Makefile	2010-04-27 12:48:39.021202649 +0200
@@ -20,14 +20,11 @@
 
 # General Makefile variables
 DESTDIR = 
-PREFIX = /usr/local
+PREFIX = /usr
 DATADIR = $(PREFIX)/share/mmc
 ETCDIR = /etc/mmc
 INSTALL = $(shell which install)
 CP = $(shell which cp)
-CHOWN = $(shell which chown)
-CHGRP = $(shell which chgrp)
-HTTPDUSER = www-data
 SED = $(shell which sed)
 RM = $(shell which rm)
 APACHE_CONF = confs/apache/mmc.conf
@@ -70,12 +67,10 @@
 install: build_mo apache_conf
 	@echo ""
 	@echo "Installing mmc-web in $(DESTDIR)$(DATADIR)"
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(DATADIR)
-	$(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(DATADIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)
 	$(CP) -R $(FILESTOINSTALL) $(DESTDIR)$(DATADIR)
-	$(CHOWN) -R root $(DESTDIR)$(DATADIR)
-	$(CHGRP) -R root $(DESTDIR)$(DATADIR)
-	$(INSTALL) confs/mmc.ini -m 640 -o root -g $(HTTPDUSER) $(DESTDIR)$(ETCDIR)
+	$(INSTALL) confs/mmc.ini -m 640 $(DESTDIR)$(ETCDIR)
 	$(SED) -i 's!^rootfs[ \t].*$$!rootfs = $(DATADIR)/!' $(DESTDIR)$(ETCDIR)/mmc.ini
 	$(SED) -i 's!^rootfsmodules[ \t].*$$!rootfsmodules = $(DATADIR)/modules/!' $(DESTDIR)$(ETCDIR)/mmc.ini
 	find $(DESTDIR)$(DATADIR) -type f -name *.po -exec rm -f {} \;

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional