Hello community, here is the log from the commit of package tomoyo-tools for openSUSE:Factory checked in at Wed Jun 29 09:57:14 CEST 2011.
-------- --- tomoyo-tools/tomoyo-tools.changes 2011-01-15 09:41:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/tomoyo-tools/tomoyo-tools.changes 2011-06-28 15:13:32.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Jun 28 15:09:46 CEST 2011 - meiss...@suse.de + +- Update to 20110511 snapshot: + * Version 2.3.0p1 2011/02/11 Bugfix release. + + /sbin/tomoyo-init + Mount sysfs when /sys/kernel/security/ does not exist rather than when /sys/kernel/ does not exist, for some distributions have /sys/kernel/debug/ on root device. + Wait for /etc/tomoyo/tomoyo-post-init in a more reliable way. + + /usr/sbin/tomoyo-diffpolicy + Fix regression introduced when fixing old/new inversion bug. + + * Version 2.3.0p2 2011/05/11 Minor update release. + + Fix build error on parallel build. + + /usr/lib/libtomoyotools.so.1 + Fix wrong domainname validation. + + /usr/sbin/tomoyo-editpolicy + Allow configuring background color. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tomoyo-tools-2.3.0-20100820.tar.gz New: ---- tomoyo-tools-2.3.0-20110511.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomoyo-tools.spec ++++++ --- /var/tmp/diff_new_pack.Y57wGO/_old 2011-06-29 09:51:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Y57wGO/_new 2011-06-29 09:51:36.000000000 +0200 @@ -16,7 +16,7 @@ # -%define downloadver 2.3.0-20100820 +%define downloadver 2.3.0-20110511 BuildRequires: help2man ncurses-devel Name: tomoyo-tools @@ -25,7 +25,7 @@ AutoReqProv: on Summary: A Friendly Greeting Program Url: http://sourceforge.jp/projects/tomoyo/ -Version: 2.3.0.20100820 +Version: 2.3.0.20110511 Release: 1 Source0: http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/tomoyo-tools-%{downloadver}.tar.gz Patch0: %{name}-makefile.patch ++++++ tomoyo-tools-2.3.0-20100820.tar.gz -> tomoyo-tools-2.3.0-20110511.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/Makefile new/tomoyo-tools/Makefile --- old/tomoyo-tools/Makefile 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/Makefile 2011-05-11 02:00:00.000000000 +0200 @@ -12,7 +12,6 @@ $(MAKE) -C sbin/ all $(MAKE) -C usr_sbin/ all $(MAKE) -C usr_lib_tomoyo/ all - $(MAKE) -C usr_share_man/ all install: all $(MAKE) -C sbin/ install @@ -24,6 +23,5 @@ $(MAKE) -C sbin/ clean $(MAKE) -C usr_sbin/ clean $(MAKE) -C usr_lib_tomoyo/ clean - $(MAKE) -C usr_share_man/ clean .PHONY: clean install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/README.tomoyo new/tomoyo-tools/README.tomoyo --- old/tomoyo-tools/README.tomoyo 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/README.tomoyo 2011-05-11 02:00:00.000000000 +0200 @@ -18,3 +18,22 @@ Version 2.3.0 2010/08/20 Major update release. Various enhancements were added to kernel 2.6.36. + +Version 2.3.0p1 2011/02/11 Bugfix release. + + /sbin/tomoyo-init + Mount sysfs when /sys/kernel/security/ does not exist rather than when /sys/kernel/ does not exist, for some distributions have /sys/kernel/debug/ on root device. + Wait for /etc/tomoyo/tomoyo-post-init in a more reliable way. + + /usr/sbin/tomoyo-diffpolicy + Fix regression introduced when fixing old/new inversion bug. + +Version 2.3.0p2 2011/05/11 Minor update release. + + Fix build error on parallel build. + + /usr/lib/libtomoyotools.so.1 + Fix wrong domainname validation. + + /usr/sbin/tomoyo-editpolicy + Allow configuring background color. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/kernel_test/tomoyo_file_test.c new/tomoyo-tools/kernel_test/tomoyo_file_test.c --- old/tomoyo-tools/kernel_test/tomoyo_file_test.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/kernel_test/tomoyo_file_test.c 2011-05-11 02:00:00.000000000 +0200 @@ -19,6 +19,32 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include "include.h" +#include <linux/elf.h> + +static void make_elf_lib(void) +{ + static const struct elf32_phdr eph = { + .p_type = PT_LOAD, + .p_offset = 4096, + .p_filesz = 1, + }; + static const struct elf32_hdr eh = { + .e_ident = ELFMAG, + .e_type = ET_EXEC, + .e_machine = EM_386, + .e_phoff = sizeof(eh), + .e_phentsize = sizeof(eph), + .e_phnum = 1, + }; + const int fd = open("/tmp/uselib", O_WRONLY | O_CREAT | O_TRUNC, 0755); + if (fd != EOF) { + write(fd, &eh, sizeof(eh)); + write(fd, &eph, sizeof(eph)); + lseek(fd, 4096, SEEK_SET); + write(fd, "", 1); + close(fd); + } +} static int should_fail = 0; @@ -85,7 +111,7 @@ } show_prompt("uselib()"); - show_result(uselib("/bin/true")); + show_result(uselib("/tmp/uselib")); { int pipe_fd[2] = { EOF, EOF }; @@ -280,6 +306,7 @@ int main(int argc, char *argv[]) { tomoyo_test_init(); + make_elf_lib(); printf("***** Testing file hooks in enforce mode. *****\n"); create_files(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/kernel_test/tomoyo_new_file_test.c new/tomoyo-tools/kernel_test/tomoyo_new_file_test.c --- old/tomoyo-tools/kernel_test/tomoyo_new_file_test.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/kernel_test/tomoyo_new_file_test.c 2011-05-11 02:00:00.000000000 +0200 @@ -19,6 +19,32 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include "include.h" +#include <linux/elf.h> + +static void make_elf_lib(void) +{ + static const struct elf32_phdr eph = { + .p_type = PT_LOAD, + .p_offset = 4096, + .p_filesz = 1, + }; + static const struct elf32_hdr eh = { + .e_ident = ELFMAG, + .e_type = ET_EXEC, + .e_machine = EM_386, + .e_phoff = sizeof(eh), + .e_phentsize = sizeof(eph), + .e_phnum = 1, + }; + const int fd = open("/tmp/uselib", O_WRONLY | O_CREAT | O_TRUNC, 0755); + if (fd != EOF) { + write(fd, &eh, sizeof(eh)); + write(fd, &eph, sizeof(eph)); + lseek(fd, 4096, SEEK_SET); + write(fd, "", 1); + close(fd); + } +} static const char *policy = ""; @@ -180,11 +206,11 @@ write_domain_policy(policy, 1); show_result(sysctl(name, 3, buffer, &size, buffer, size), 0); - policy = "allow_read /bin/true"; + policy = "allow_read /tmp/uselib"; write_domain_policy(policy, 0); - show_result(uselib("/bin/true"), 1); + show_result(uselib("/tmp/uselib"), 1); write_domain_policy(policy, 1); - show_result(uselib("/bin/true"), 0); + show_result(uselib("/tmp/uselib"), 0); policy = "allow_execute /bin/true"; write_domain_policy(policy, 0); @@ -657,6 +683,7 @@ int main(int argc, char *argv[]) { tomoyo_test_init(); + make_elf_lib(); fprintf(domain_fp, "%s /bin/true\n", self_domain); fprintf(domain_fp, "use_profile 255\n"); fprintf(domain_fp, "select pid=%u\n", pid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/sbin/tomoyo-init.c new/tomoyo-tools/sbin/tomoyo-init.c --- old/tomoyo-tools/sbin/tomoyo-init.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/sbin/tomoyo-init.c 2011-05-11 02:00:00.000000000 +0200 @@ -3,9 +3,9 @@ * * TOMOYO Linux's utilities. * - * Copyright (C) 2005-2010 NTT DATA CORPORATION + * Copyright (C) 2005-2011 NTT DATA CORPORATION * - * Version: 2.3.0 2010/08/20 + * Version: 2.3.0+ 2011/02/11 * * This program is executed automatically by kernel * when execution of /sbin/init is requested. @@ -306,7 +306,7 @@ if (lstat("/proc/self/", &buf) || !S_ISDIR(buf.st_mode)) proc_unmount = !mount("/proc", "/proc/", "proc", 0, NULL); /* Mount /sys if not mounted. */ - if (lstat("/sys/kernel/", &buf) || !S_ISDIR(buf.st_mode)) + if (lstat("/sys/kernel/security/", &buf) || !S_ISDIR(buf.st_mode)) sys_unmount = !mount("/sys", "/sys", "sysfs", 0, NULL); /* Mount /sys/kernel/security if not mounted. */ if (lstat("/sys/kernel/security/tomoyo/", &buf) || @@ -418,7 +418,8 @@ /* Do additional initialization. */ if (!access("/etc/tomoyo/tomoyo-post-init", X_OK)) { - switch (fork()) { + const pid_t pid = fork(); + switch (pid) { case 0: execl("/etc/tomoyo/tomoyo-post-init", "/etc/tomoyo/tomoyo-post-init", NULL); @@ -426,7 +427,8 @@ case -1: panic(); } - wait(NULL); + while (waitpid(pid, NULL, __WALL) == EOF && + errno == EINTR); } show_domain_usage(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/tomoyo-tools.spec new/tomoyo-tools/tomoyo-tools.spec --- old/tomoyo-tools/tomoyo-tools.spec 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/tomoyo-tools.spec 2011-05-11 02:00:00.000000000 +0200 @@ -2,18 +2,19 @@ Name: tomoyo-tools Version: 2.3.0 -Release: 1 +Release: 3 License: GPL Group: System Environment/Kernel ExclusiveOS: Linux Autoreqprov: no Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Conflicts: tomoyo-tools < 2.3.0-1 +Conflicts: tomoyo-tools < 2.3.0-3 -Source0: http://osdn.dl.sourceforge.jp/tomoyo/48663/tomoyo-tools-2.3.0-20100820.tar.gz +Source0: http://osdn.dl.sourceforge.jp/tomoyo/48663/tomoyo-tools-2.3.0-20110511.tar.gz %description -This is TOMOYO Linux tools. +This package contains userspace tools for administrating TOMOYO Linux 2.3.x. +Please see http://tomoyo.sourceforge.jp/2.3/ for documentation. %prep @@ -40,6 +41,16 @@ %config(noreplace) /usr/lib/tomoyo/tomoyotools.conf %changelog +* Wed May 11 2011 2.3.0-3 +- Fix build error on parallel build. +- Fix wrong domainname validation. +- Allow configuring tomoyo-editpolicy's background color. + +* Fri Feb 11 2011 2.3.0-2 +- Mount sysfs when /sys/kernel/security/ does not exist rather than when /sys/kernel/ does not exist, for some distributions have /sys/kernel/debug/ on root device. +- Wait for /etc/tomoyo/tomoyo-post-init in a more reliable way. +- Fix regression introduced when fixing old/new inversion bug. + * Fri Aug 20 2010 2.3.0-1 - Rebased using ccs-tools package. - Various enhancements were added to kernel 2.6.36. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_lib_tomoyo/dummy new/tomoyo-tools/usr_lib_tomoyo/dummy --- old/tomoyo-tools/usr_lib_tomoyo/dummy 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_lib_tomoyo/dummy 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#! /bin/sh -echo "This command is not implemented." -exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_lib_tomoyo/init_policy.c new/tomoyo-tools/usr_lib_tomoyo/init_policy.c --- old/tomoyo-tools/usr_lib_tomoyo/init_policy.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_lib_tomoyo/init_policy.c 2011-05-11 02:00:00.000000000 +0200 @@ -1417,7 +1417,7 @@ return; fp = fopen("meminfo.tmp", "w"); if (!fp) { - fprintf(stderr, "ERROR: Can't create manager policy.\n"); + fprintf(stderr, "ERROR: Can't create meminfo policy.\n"); return; } fprintf(stderr, "Creating memory quota policy... "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_lib_tomoyo/tomoyotools.conf new/tomoyo-tools/usr_lib_tomoyo/tomoyotools.conf --- old/tomoyo-tools/usr_lib_tomoyo/tomoyotools.conf 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_lib_tomoyo/tomoyotools.conf 2011-05-11 02:00:00.000000000 +0200 @@ -61,3 +61,4 @@ editpolicy.line_color MEMORY_HEAD = 03 editpolicy.line_color PROFILE_CURSOR = 71 editpolicy.line_color PROFILE_HEAD = 71 +editpolicy.line_color DEFAULT_COLOR = 70 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/Makefile new/tomoyo-tools/usr_sbin/Makefile --- old/tomoyo-tools/usr_sbin/Makefile 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/Makefile 2011-05-11 02:00:00.000000000 +0200 @@ -1,30 +1,39 @@ -BUILD_FILES = tomoyo-domainmatch tomoyo-queryd tomoyo-pstree tomoyo-checkpolicy tomoyo-editpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy +BUILD_FILES = tomoyo-domainmatch tomoyo-queryd tomoyo-pstree \ + tomoyo-checkpolicy tomoyo-editpolicy tomoyo-findtemp tomoyo-ld-watch \ + tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel \ + tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy \ + tomoyo-selectpolicy all: libtomoyotools.so $(BUILD_FILES) +$(BUILD_FILES): libtomoyotools.so + /usr/include/curses.h: @echo "/usr/include/curses.h is missing." - @echo "Run 'yum install ncurses-devel' or 'apt-get install libncurses5-dev'" + @echo "Run 'yum install ncurses-devel' or 'apt-get install libncurses-dev'" sleep 10 -tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h - $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON || ln -f dummy tomoyo-editpolicy - -tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h - $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. || ln -f dummy tomoyo-queryd - libtomoyotools.so: tomoyotools.c tomoyotools.h - $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.0 - ln -sf libtomoyotools.so.1.0.0 libtomoyotools.so + $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 + ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so .c: $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $< +tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so + $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON + +tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so + $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. + install: all mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/usr/sbin/ - cp -ad --remove-destination libtomoyotools.so.1.0.0 $(INSTALLDIR)/usr/lib/ - ln -sf libtomoyotools.so.1.0.0 $(INSTALLDIR)/usr/lib/libtomoyotools.so.1 + cp -ad --remove-destination libtomoyotools.so.1.0.1 $(INSTALLDIR)/usr/lib/ + ln -sf libtomoyotools.so.1.0.1 $(INSTALLDIR)/usr/lib/libtomoyotools.so.1 +ifeq ($(INSTALLDIR),) + ldconfig || true +endif clean: rm -f -- $(BUILD_FILES) libtomoyotools.so* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/dummy new/tomoyo-tools/usr_sbin/dummy --- old/tomoyo-tools/usr_sbin/dummy 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/dummy 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#! /bin/sh -echo "This command is not implemented." -exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/editpolicy.h new/tomoyo-tools/usr_sbin/editpolicy.h --- old/tomoyo-tools/usr_sbin/editpolicy.h 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/editpolicy.h 2011-05-11 02:00:00.000000000 +0200 @@ -3,9 +3,9 @@ * * TOMOYO Linux's utilities. * - * Copyright (C) 2005-2010 NTT DATA CORPORATION + * Copyright (C) 2005-2011 NTT DATA CORPORATION * - * Version: 2.3.0 2010/08/20 + * Version: 2.3.0+ 2011/05/11 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License v2 as published by the @@ -146,6 +146,7 @@ CCS_MANAGER_CURSOR, CCS_MEMORY_HEAD, CCS_MEMORY_CURSOR, + CCS_DEFAULT_COLOR, CCS_DISP_ERR }; @@ -155,7 +156,6 @@ int tomoyo_add_address_group_policy(char *data, const _Bool is_delete); int tomoyo_add_number_group_policy(char *data, const _Bool is_delete); -int tomoyo_editpolicy_color_cursor(const int screen); int tomoyo_editpolicy_color_head(const int screen); int tomoyo_editpolicy_get_current(void); void tomoyo_editpolicy_attr_change(const attr_t attr, const _Bool flg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/editpolicy_color.c new/tomoyo-tools/usr_sbin/editpolicy_color.c --- old/tomoyo-tools/usr_sbin/editpolicy_color.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/editpolicy_color.c 2011-05-11 02:00:00.000000000 +0200 @@ -3,9 +3,9 @@ * * TOMOYO Linux's utilities. * - * Copyright (C) 2005-2010 NTT DATA CORPORATION + * Copyright (C) 2005-2011 NTT DATA CORPORATION * - * Version: 2.3.0 2010/08/20 + * Version: 2.3.0+ 2011/05/11 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License v2 as published by the @@ -57,6 +57,8 @@ COLOR_YELLOW, "MEMORY_HEAD" }, { CCS_MEMORY_CURSOR, COLOR_BLACK, COLOR_YELLOW, "MEMORY_CURSOR" }, + { CCS_DEFAULT_COLOR, COLOR_WHITE, + COLOR_BLACK, "DEFAULT_COLOR" }, { CCS_NORMAL, COLOR_WHITE, COLOR_BLACK, NULL } }; @@ -105,11 +107,12 @@ init_pair(colorp->tag, colorp->fore, colorp->back); } init_pair(CCS_DISP_ERR, COLOR_RED, COLOR_BLACK); /* error message */ + bkgdset(A_NORMAL | COLOR_PAIR(CCS_DEFAULT_COLOR) | ' '); } static void tomoyo_editpolicy_color_save(const _Bool flg) { - static attr_t save_color = CCS_NORMAL; + static attr_t save_color = CCS_DEFAULT_COLOR; if (flg) save_color = getattrs(stdscr); else @@ -160,7 +163,7 @@ } } -int tomoyo_editpolicy_color_cursor(const int screen) +static inline int tomoyo_editpolicy_color_cursor(const int screen) { switch (screen) { case CCS_SCREEN_DOMAIN_LIST: @@ -195,7 +198,7 @@ if (-1 < tomoyo_before_current[screen] && current != tomoyo_before_current[screen]){ move(CCS_HEADER_LINES + tomoyo_before_y[screen], 0); - chgat(-1, A_NORMAL, CCS_NORMAL, NULL); + chgat(-1, A_NORMAL, CCS_DEFAULT_COLOR, NULL); } move(y, x); @@ -225,9 +228,7 @@ } int tomoyo_editpolicy_color_head(const int screen) { -} -int tomoyo_editpolicy_color_cursor(const int screen) -{ + return CCS_NORMAL; } void tomoyo_editpolicy_line_draw(const int screen) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/tomoyo-diffpolicy.c new/tomoyo-tools/usr_sbin/tomoyo-diffpolicy.c --- old/tomoyo-tools/usr_sbin/tomoyo-diffpolicy.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/tomoyo-diffpolicy.c 2011-05-11 02:00:00.000000000 +0200 @@ -5,7 +5,7 @@ * * Copyright (C) 2005-2010 NTT DATA CORPORATION * - * Version: 2.3.0 2010/08/20 + * Version: 2.3.0+ 2010/12/03 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License v2 as published by the @@ -102,7 +102,7 @@ if (first) printf("%s\n\n", domainname->name); first = false; - printf("delete %s\n", new_string_ptr[i]->name); + printf("%s\n", new_string_ptr[i]->name); } for (i = 0; i < old_string_count; i++) { if (!old_string_ptr[i]) @@ -110,16 +110,16 @@ if (first) printf("%s\n\n", domainname->name); first = false; - printf("%s\n", old_string_ptr[i]->name); + printf("delete %s\n", old_string_ptr[i]->name); } if (old_policy.list[old_index].profile != new_policy.list[new_index].profile) { if (first) printf("%s\n\n", domainname->name); first = false; - if (old_policy.list[old_index].profile_assigned) + if (new_policy.list[new_index].profile_assigned) printf(CCS_KEYWORD_USE_PROFILE "%u\n", - old_policy.list[old_index].profile); + new_policy.list[new_index].profile); } if (!first) printf("\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_sbin/tomoyotools.c new/tomoyo-tools/usr_sbin/tomoyotools.c --- old/tomoyo-tools/usr_sbin/tomoyotools.c 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_sbin/tomoyotools.c 2011-05-11 02:00:00.000000000 +0200 @@ -3,9 +3,9 @@ * * TOMOYO Linux's utilities. * - * Copyright (C) 2005-2010 NTT DATA CORPORATION + * Copyright (C) 2005-2011 NTT DATA CORPORATION * - * Version: 2.3.0 2010/08/20 + * Version: 2.3.0+ 2011/05/11 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License v2 as published by the @@ -373,7 +373,7 @@ if (!cp) break; if (*domainname != '/' || - !tomoyo_correct_word2(domainname, cp - domainname - 1)) + !tomoyo_correct_word2(domainname, cp - domainname)) goto out; domainname = cp + 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomoyo-tools/usr_share_man/Makefile new/tomoyo-tools/usr_share_man/Makefile --- old/tomoyo-tools/usr_share_man/Makefile 2010-08-20 02:00:00.000000000 +0200 +++ new/tomoyo-tools/usr_share_man/Makefile 2011-05-11 02:00:00.000000000 +0200 @@ -2,12 +2,11 @@ man8/%.8.gz : % @mkdir -p man8 - @chmod 755 $^ - ./$^ + sh ./$< all: $(patsubst %,man8/%.8.gz,$(SRC)) -install: all +install: mkdir -p $(INSTALLDIR)/usr/share/man/man8 cp -af --remove-destination man8/* $(INSTALLDIR)/usr/share/man/man8/ Files old/tomoyo-tools/usr_share_man/man8/init_policy.8.gz and new/tomoyo-tools/usr_share_man/man8/init_policy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-checkpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-checkpolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-diffpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-diffpolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-domainmatch.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-domainmatch.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-editpolicy-agent.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-editpolicy-agent.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-editpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-editpolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-findtemp.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-findtemp.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-init.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-init.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-ld-watch.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-ld-watch.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-loadpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-loadpolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-notifyd.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-notifyd.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-patternize.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-patternize.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-pstree.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-pstree.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-queryd.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-queryd.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-savepolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-savepolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-selectpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-selectpolicy.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-setlevel.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-setlevel.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-setprofile.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-setprofile.8.gz differ Files old/tomoyo-tools/usr_share_man/man8/tomoyo-sortpolicy.8.gz and new/tomoyo-tools/usr_share_man/man8/tomoyo-sortpolicy.8.gz differ ++++++ tomoyo-tools-makefile.patch ++++++ --- /var/tmp/diff_new_pack.Y57wGO/_old 2011-06-29 09:51:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Y57wGO/_new 2011-06-29 09:51:36.000000000 +0200 @@ -3,14 +3,14 @@ --- tomoyo-tools.orig/usr_sbin/Makefile +++ tomoyo-tools/usr_sbin/Makefile @@ -18,7 +18,7 @@ libtomoyotools.so: tomoyotools.c tomoyot - ln -sf libtomoyotools.so.1.0.0 libtomoyotools.so + ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so .c: - $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $< + $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. - install: all - mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib + tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so + $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON Index: tomoyo-tools/sbin/Makefile =================================================================== --- tomoyo-tools.orig/sbin/Makefile @@ -48,7 +48,7 @@ =================================================================== --- tomoyo-tools.orig/usr_sbin/editpolicy.h +++ tomoyo-tools/usr_sbin/editpolicy.h -@@ -151,7 +151,7 @@ enum tomoyo_color_pair { +@@ -152,7 +152,7 @@ enum tomoyo_color_pair { #define CCS_HEADER_LINES 3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
