SOURCES: iodine-make.patch, iodine-opt.patch - update to 0.4.2

[glen]

Author: glen                         Date: Fri Nov 21 11:46:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 0.4.2

---- Files affected:
SOURCES:
   iodine-make.patch (1.1 -> 1.2) , iodine-opt.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/iodine-make.patch
diff -u SOURCES/iodine-make.patch:1.1 SOURCES/iodine-make.patch:1.2
--- SOURCES/iodine-make.patch:1.1	Sat Jun  9 00:13:01 2007
+++ SOURCES/iodine-make.patch	Fri Nov 21 12:46:24 2008
@@ -1,45 +1,30 @@
---- iodine-0.4.0/Makefile	2007-06-09 01:12:08.835961750 +0300
-+++ iodine-0.4.0/Makefile	2007-06-09 01:13:12.717415147 +0300
-@@ -6,30 +6,31 @@
- MKDIR=mkdir
- MKDIR_FLAGS=-p
-+MANDIR=$(PREFIX)/man
- 
- RM=rm
+--- iodine-0.4.2/Makefile	2008-11-21 13:44:41.755943542 +0200
++++ iodine-0.4.2/Makefile	2008-11-21 13:45:21.234222315 +0200
+@@ -1,4 +1,4 @@
+-prefix=/usr/local
++prefix=/usr
+ sbindir=$(prefix)/sbin
+ datadir=$(prefix)/share
+ mandir=$(datadir)/man
+@@ -15,7 +15,7 @@
  RM_FLAGS=-f
  
  all: 
--	@(cd src; make all)
+-	@(cd src; $(MAKE) all)
 +	$(MAKE) -C src all
  
  install: all
--	$(MKDIR) $(MKDIR_FLAGS) $(PREFIX)/sbin
--	$(INSTALL) $(INSTALL_FLAGS) bin/iodine $(PREFIX)/sbin/iodine
--	$(INSTALL) $(INSTALL_FLAGS) bin/iodined $(PREFIX)/sbin/iodined
--	$(MKDIR) $(MKDIR_FLAGS) $(PREFIX)/man/man8
--	$(INSTALL) $(INSTALL_FLAGS) man/iodine.8 $(PREFIX)/man/man8/iodine.8
-+	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(PREFIX)/sbin
-+	$(INSTALL) $(INSTALL_FLAGS) bin/iodine $(DESTDIR)$(PREFIX)/sbin/iodine
-+	$(INSTALL) $(INSTALL_FLAGS) bin/iodined $(DESTDIR)$(PREFIX)/sbin/iodined
-+	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(MANDIR)/man8
-+	$(INSTALL) $(INSTALL_FLAGS) man/iodine.8 $(DESTDIR)$(MANDIR)/man8/iodine.8
- 
- uninstall:
--	$(RM) $(RM_FLAGS) $(PREFIX)/sbin/iodine
--	$(RM) $(RM_FLAGS) $(PREFIX)/sbin/iodined
--	$(RM) $(RM_FLAGS) $(PREFIX)/man/man8/iodine.8
-+	$(RM) $(RM_FLAGS) $(DESTDIR)$(PREFIX)/sbin/iodine
-+	$(RM) $(RM_FLAGS) $(DESTDIR)$(PREFIX)/sbin/iodined
-+	$(RM) $(RM_FLAGS) $(DESTDIR)$(PREFIX)/man/man8/iodine.8
- 	
- test: all
--	@(cd tests; make all)
+ 	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
+@@ -36,10 +36,10 @@
+ 	@echo "!! The check library is required for compiling and running the tests"
+ 	@echo "!! Get it at http://check.sf.net"
+-	@(cd tests; $(MAKE) all)
 +	$(MAKE) -C tests all
  
  clean:
  	@echo "Cleaning..."
--	@(cd src; make clean)
--	@(cd tests; make clean)
+-	@(cd src; $(MAKE) clean)
+-	@(cd tests; $(MAKE) clean)
 +	@$(MAKE) -C src clean
 +	@$(MAKE) -C tests clean
  	@rm -rf bin

================================================================
Index: SOURCES/iodine-opt.patch
diff -u SOURCES/iodine-opt.patch:1.1 SOURCES/iodine-opt.patch:1.2
--- SOURCES/iodine-opt.patch:1.1	Sat Jun  9 00:13:01 2007
+++ SOURCES/iodine-opt.patch	Fri Nov 21 12:46:25 2008
@@ -1,13 +1,13 @@
---- iodine-0.4.0/src/Makefile~	2007-02-11 15:54:40.000000000 +0200
-+++ iodine-0.4.0/src/Makefile	2007-06-09 01:06:48.768677264 +0300
-@@ -7,8 +7,9 @@
+--- iodine-0.4.2/src/Makefile~	2008-11-21 13:42:44.000000000 +0200
++++ iodine-0.4.2/src/Makefile	2008-11-21 13:43:11.606739911 +0200
+@@ -8,8 +8,9 @@
  OS = `uname | tr "a-z" "A-Z"`
  ARCH = `uname -m`
  
 +OPTFLAGS = -g -Wall
- LDFLAGS =  -lz
+ LDFLAGS =  -lz `sh osflags link`
 -CFLAGS = -c -g -Wall -D$(OS) -pedantic
 +CFLAGS = -c $(OPTFLAGS) -D$(OS) -pedantic
  
- all: stateos $(CLIENT) $(SERVER) $(TESTSUITE) 
+ all: stateos $(CLIENT) $(SERVER)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iodine-make.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iodine-opt.patch?r1=1.1&r2=1.2&f=u