[gentoo-commits] gentoo-x86 commit in sys-process/incron/files: incrond.init incron-0.5.9-Makefile.patch incron-0.5.9-gcc44.patch incron-0.5.7-gcc43.patch incron-0.5.7-gentoo.patch

[Christian Ruppert (idl0r)]

idl0r       11/01/31 15:14:12

  Added:                incrond.init incron-0.5.9-Makefile.patch
                        incron-0.5.9-gcc44.patch
  Removed:              incron-0.5.7-gcc43.patch incron-0.5.7-gentoo.patch
  Log:
  Take maintainership. Revision bump. Reorder patches. Add separate init script. Fix INOTIFY check. Remove old ebuilds/patches.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-process/incron/files/incrond.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incrond.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incrond.init?rev=1.1&content-type=text/plain

Index: incrond.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/files/incrond.init,v 1.1 2011/01/31 15:14:12 idl0r Exp $

depend() {
	use clock logger
	need localmount
}

start() {
	ebegin "Starting incrond"
	start-stop-daemon --start --pidfile /var/run/incrond.pid --exec /usr/sbin/incrond -- -f /etc/incron.conf
	eend $?
}

stop() {
	ebegin "Stopping incrond"
	start-stop-daemon --stop --pidfile /var/run/incrond.pid
	eend $?
}



1.1                  sys-process/incron/files/incron-0.5.9-Makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incron-0.5.9-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incron-0.5.9-Makefile.patch?rev=1.1&content-type=text/plain

Index: incron-0.5.9-Makefile.patch
===================================================================
From 3f4e9ad5e9cf57fabdcaa3c1bc296b449c061a1b Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@g.o>
Date: Mon, 31 Jan 2011 16:00:34 +0100
Subject: [PATCH 2/2] Some improvements

Respect DESTDIR.
Don't override CXX/CXXFLAGS/LDFLAGS.
Create all necessary directories during install.
Install the example configuration into $(PREFIX)/share/doc/... instead of /etc.
---
 Makefile |   57 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index ded8e68..3ffc854 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-
 PREFIX = /usr/local
 USERDATADIR = /var/spool/incron
 SYSDATADIR = /etc/incron.d
 CFGDIR = /etc
-MANPATH = /usr/share/man
+MANPATH = $(PREFIX)/share/man
 RELEASE = incron-`cat VERSION`
 RELEASEDIR = /tmp/$(RELEASE)
+DOCDIR = $(PREFIX)/share/doc/$(RELEASE)/
 
 USER = root
 
-CXX = g++
+CXX ?= g++
 INSTALL = install
 
 OPTIMIZE = -O2
@@ -17,8 +17,8 @@ DEBUG = -g0
 WARNINGS = -Wall
 CXXAUX = -pipe
 
-CXXFLAGS = $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX)
-LDFLAGS = $(WARNINGS)
+CXXFLAGS ?= $(OPTIMIZE) $(DEBUG) $(CXXAUX)
+CXXFLAGS += $(WARNINGS)
 
 PROGRAMS = incrond incrontab
 
@@ -29,10 +29,10 @@ INCRONTAB_OBJ = ict-main.o incrontab.o inotify-cxx.o strtok.o incroncfg.o apparg
 all:	$(PROGRAMS)
 
 incrond:	$(INCROND_OBJ)
-	$(CXX) $(LDFLAGS) -o $@ $(INCROND_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCROND_OBJ)
 
 incrontab:	$(INCRONTAB_OBJ)
-	$(CXX) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ)
 
 .cpp.o:
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
@@ -44,33 +44,34 @@ clean:
 distclean: clean
 
 install:	all install-man
-	[ -d $(PREFIX) ]
-	$(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/
-	$(INSTALL) -m 0755 incrond $(PREFIX)/sbin/
-	$(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR)
-	$(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR)
-	$(INSTALL) -m 0644 -o $(USER) incron.conf.example $(CFGDIR)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin/
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/sbin/
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/
+	$(INSTALL) -m 04755 -o $(USER) incrontab $(DESTDIR)$(PREFIX)/bin/
+	$(INSTALL) -m 0755 incrond $(DESTDIR)$(PREFIX)/sbin/
+	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(USERDATADIR)
+	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(SYSDATADIR)
+	$(INSTALL) -m 0644 incron.conf.example $(DESTDIR)$(DOCDIR)/
 
 install-man:	incrontab.1 incrontab.5 incrond.8 incron.conf.5
-	$(INSTALL) -m 0755 -d $(MANPATH)/man1
-	$(INSTALL) -m 0755 -d $(MANPATH)/man5
-	$(INSTALL) -m 0755 -d $(MANPATH)/man8
-	$(INSTALL) -m 0644 incrontab.1 $(MANPATH)/man1
-	$(INSTALL) -m 0644 incrontab.5 $(MANPATH)/man5
-	$(INSTALL) -m 0644 incrond.8 $(MANPATH)/man8
-	$(INSTALL) -m 0644 incron.conf.5 $(MANPATH)/man5
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man1
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man5
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man8
+	$(INSTALL) -m 0644 incrontab.1 $(DESTDIR)$(MANPATH)/man1
+	$(INSTALL) -m 0644 incrontab.5 $(DESTDIR)$(MANPATH)/man5
+	$(INSTALL) -m 0644 incrond.8 $(DESTDIR)$(MANPATH)/man8
+	$(INSTALL) -m 0644 incron.conf.5 $(DESTDIR)$(MANPATH)/man5
 
 uninstall:	uninstall-man
-	[ -d $(PREFIX) ]
-	rm -f $(PREFIX)/bin/incrontab
-	rm -f $(PREFIX)/sbin/incrond
-	rm -f $(CFGDIR)/incron.conf.example
+	rm -f $(DESTDIR)$(PREFIX)/bin/incrontab
+	rm -f $(DESTDIR)$(PREFIX)/sbin/incrond
+	rm -rf $(DESTDIR)$(DOCDIR)/
 
 uninstall-man:
-	rm -f $(MANPATH)/man1/incrontab.1
-	rm -f $(MANPATH)/man5/incrontab.5
-	rm -f $(MANPATH)/man8/incrond.8
-	rm -f $(MANPATH)/man5/incron.conf.5
+	rm -f $(DESTDIR)$(MANPATH)/man1/incrontab.1
+	rm -f $(DESTDIR)$(MANPATH)/man5/incrontab.5
+	rm -f $(DESTDIR)$(MANPATH)/man8/incrond.8
+	rm -f $(DESTDIR)$(MANPATH)/man5/incron.conf.5
 
 update:		uninstall install
 
-- 
1.7.3.4




1.1                  sys-process/incron/files/incron-0.5.9-gcc44.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incron-0.5.9-gcc44.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/incron/files/incron-0.5.9-gcc44.patch?rev=1.1&content-type=text/plain

Index: incron-0.5.9-gcc44.patch
===================================================================
From 09eee740a4b962b4d8140b3256bddc62b6cd8cb5 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@g.o>
Date: Mon, 31 Jan 2011 15:04:10 +0100
Subject: [PATCH 1/2] GCC 4.4 fixes

http://bts.aiken.cz/view.php?id=385
http://bts.aiken.cz/view.php?id=447
---
 appargs.cpp   |    1 +
 appinst.h     |    1 +
 incroncfg.cpp |    2 +-
 incroncfg.h   |    1 +
 inotify-cxx.h |    1 +
 5 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/appargs.cpp b/appargs.cpp
index 3bac9b7..ac238b2 100644
--- a/appargs.cpp
+++ b/appargs.cpp
@@ -21,6 +21,7 @@
 
 
 #include <cstring>
+#include <cstdio>
 
 #include "strtok.h"
 
diff --git a/appinst.h b/appinst.h
index d5f2cbe..bdbc8e7 100644
--- a/appinst.h
+++ b/appinst.h
@@ -23,6 +23,7 @@
 
 
 #include <string>
+#include <cstdio>
 
 
 #define APPLOCK_BASEDIR "/var/run"
diff --git a/incroncfg.cpp b/incroncfg.cpp
index 6ff4d76..54fcfc5 100644
--- a/incroncfg.cpp
+++ b/incroncfg.cpp
@@ -181,7 +181,7 @@ bool IncronCfg::ParseLine(const char* s, std::string& rKey, std::string& rVal)
 
 bool IncronCfg::IsComment(const char* s)
 {
-  char* sx = strchr(s, '#');
+  const char* sx = strchr(s, '#');
   if (sx == NULL)
     return false;
     
diff --git a/incroncfg.h b/incroncfg.h
index 5d2c5b2..12aaf7d 100644
--- a/incroncfg.h
+++ b/incroncfg.h
@@ -19,6 +19,7 @@
 
 
 #include <cstring>
+#include <cstdio>
 #include <map>
 
 /// Configuration class.
diff --git a/inotify-cxx.h b/inotify-cxx.h
index bb3a0e6..1d98bd7 100644
--- a/inotify-cxx.h
+++ b/inotify-cxx.h
@@ -30,6 +30,7 @@
 #include <string>
 #include <deque>
 #include <map>
+#include <cstdio>
 
 // Please ensure that the following headers take the right place
 #include <sys/syscall.h>
-- 
1.7.3.4