- updated to 1.6.6

Changed files:
    ccs-tools-Makefile.patch -> 1.2
    ccs-tools-ncurses.patch -> 1.2
    ccs-tools.spec -> 1.2

diff --git a/ccs-tools-Makefile.patch b/ccs-tools-Makefile.patch
index f8f570b7734f87a672428af8df2ca1abd129bd61..83d83d2d0de67ce507da3be220bb7f2f00c74a7a 100644 (file)
--- a/ccs-tools-Makefile.patch
+++ b/ccs-tools-Makefile.patch
@@ -1,18 +1,19 @@
 --- ccstools/Makefile~ 2008-03-05 12:11:08.000000000 +0100
 +++ ccstools/Makefile  2008-03-05 12:14:49.672333658 +0100
-@@ -14,16 +14,11 @@
+@@ -14,17 +14,12 @@
  
- install:
+ install: all
        mkdir -p $(INSTALLDIR)/usr/lib/ccs/misc $(INSTALLDIR)/sbin $(INSTALLDIR)/usr/sbin
--      chmod 700 $(INSTALLDIR)/usr/lib/ccs
+-      chmod 755 $(INSTALLDIR)/usr/lib/ccs
 -      chmod 755 domainmatch init_policy.sh tomoyo_init_policy.sh
-       cp -af --remove-destination ccstools $(INSTALLDIR)/usr/lib/ccs/
+       cp -af --remove-destination ccstools ccstools.conf $(INSTALLDIR)/usr/lib/ccs/
        for i in $(ALIAS_LIST); do ln -f $(INSTALLDIR)/usr/lib/ccs/ccstools $(INSTALLDIR)/usr/lib/ccs/$$i; done
        for i in $(ALIAS_LIST); do ln -sf /usr/lib/ccs/$$i $(INSTALLDIR)/usr/sbin/ccs-`echo $$i | sed 's:^ccs-::'`; done
        cp -af --remove-destination realpath domainmatch init_policy.sh tomoyo_init_policy.sh $(INSTALLDIR)/usr/lib/ccs/
        cp -af --remove-destination $(MISC_FILES) $(INSTALLDIR)/usr/lib/ccs/misc/
+       cp -af --remove-destination README.ccs COPYING.ccs $(INSTALLDIR)/usr/lib/ccs/
 -      chown -R root:root ccs-init tomoyo-init $(INSTALLDIR)/usr/lib/ccs/
--      chmod 4755 $(INSTALLDIR)/usr/lib/ccs/misc/proxy
+-      chmod 4755 $(INSTALLDIR)/usr/lib/ccs/misc/force-logout
 -      chmod 700 ccs-init tomoyo-init
        cp -af --remove-destination ccs-init tomoyo-init $(INSTALLDIR)/sbin/
        mkdir -p $(INSTALLDIR)/usr/share/man/man8/

diff --git a/ccs-tools-ncurses.patch b/ccs-tools-ncurses.patch
index 0e9e645fbc6a0c3dca86d65d8abd9a8f28bb9310..a1b0ca1ac81379e630ba77dd3d95efd53a47b48d 100644 (file)
--- a/ccs-tools-ncurses.patch
+++ b/ccs-tools-ncurses.patch
@@ -13,17 +13,19 @@ diff -upr ccstools./ccstools.src/ccstools.h ccstools/ccstools.src/ccstools.h
 diff -upr ccstools./Makefile ccstools/Makefile
 --- ccstools./Makefile 2008-01-31 13:00:00.000000000 +0100
 +++ ccstools/Makefile  2008-03-05 12:04:23.715354234 +0100
-@@ -32,18 +32,14 @@ CC=gcc
+@@ -32,20 +32,15 @@ CC=gcc
  
  CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"}
  
 -/usr/include/curses.h:
 -      @echo "/usr/include/curses.h is missing."
 -      @echo "Run 'yum install ncurses-devel' or 'apt-get install libncurses5-dev'"
+-      sleep 10
 -
  /usr/include/readline/readline.h:
        @echo "/usr/include/readline/readline.h is missing."
        @echo "Run 'yum install readline-devel' or 'apt-get install libreadline5-dev'"
+       sleep 10
  
 -ccstools: ccstools.src/*.c ccstools.src/*.h /usr/include/curses.h
 +ccstools: ccstools.src/*.c ccstools.src/*.h

diff --git a/ccs-tools.spec b/ccs-tools.spec
index 3d9296a75e590080a0c3c4d6bc2bd26d0f278dbd..1c3ec2051173e3bb3db8d7f7ed7994d4609b8ec5 100644 (file)
--- a/ccs-tools.spec
+++ b/ccs-tools.spec
@@ -1,11 +1,11 @@
 Summary:       TOMOYO Linux tools
 Name:          ccs-tools
-Version:       1.5.3
+Version:       1.6.6
 Release:       1
 License:       GPL
 Group:         Base/Kernel
-Source0:       http://osdn.dl.sourceforge.jp/tomoyo/27220/%{name}-%{version}-20080131.tar.gz
-# Source0-md5: f6c0371ce5b413f8ce955630cd69f72a
+Source0:       http://osdn.dl.sourceforge.jp/tomoyo/30298/%{name}-%{version}-20090202.tar.gz
+# Source0-md5: ee6900297b263bebe19156c32c652f36
 Patch0:                %{name}-ncurses.patch
 Patch1:                %{name}-Makefile.patch
 URL:           http://tomoyo.sourceforge.jp/
@@ -36,7 +36,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/ccs-init
 %attr(755,root,root) /sbin/tomoyo-init
-%attr(755,root,root) %{_libdir}/ccs
+%attr(755,root,root) /usr/lib/ccs
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*.8*
-%attr(4755,root,root) %{_libdir}/ccs/misc/proxy