• R/O
  • SSH
  • HTTPS

tomoyo: Commit


Commit MetaInfo

Revision6842 (tree)
Time2020-11-11 20:23:33
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- branches/build-c53-2.6.18.sh (revision 6841)
+++ branches/build-c53-2.6.18.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.18-128.7.1.el5.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 if [ ! -r ccs-patch-2.6.18-centos-5.3-20110614.diff ]
@@ -38,7 +38,7 @@
3838 # by setting the define to ".local" or ".bz123456"
3939 #
4040 -#% define buildid
41-+%define buildid _tomoyo_1.8.7p2
41++%define buildid _tomoyo_1.8.8
4242 #
4343 %define sublevel 18
4444 %define kversion 2.6.%{sublevel}
@@ -66,7 +66,7 @@
6666 # END OF PATCH APPLICATIONS
6767
6868 +# TOMOYO Linux
69-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
69++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
7070 +patch -sp1 < %_sourcedir/ccs-patch-2.6.18-centos-5.3-20110614.diff
7171 +
7272 cp %{SOURCE10} Documentation/
--- branches/build-f13-2.6.33.sh (revision 6841)
+++ branches/build-f13-2.6.33.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.33.3-85.fc13.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 if [ ! -r ccs-patch-2.6.33-fedora-13-20110614.diff ]
@@ -38,7 +38,7 @@
3838 # (Uncomment the '#' and both spaces below to set the buildid.)
3939 #
4040 -# % define buildid .local
41-+%define buildid _tomoyo_1.8.7p2
41++%define buildid _tomoyo_1.8.8
4242 ###################################################################
4343
4444 # buildid can also be specified on the rpmbuild command line
@@ -77,7 +77,7 @@
7777 # END OF PATCH APPLICATIONS
7878
7979 +# TOMOYO Linux
80-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
80++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
8181 +patch -sp1 < %_sourcedir/ccs-patch-2.6.33-fedora-13-20110614.diff
8282 +
8383 %endif
--- trunk/1.8.x/ccs-patch/include/linux/ccsecurity.h (revision 6841)
+++ trunk/1.8.x/ccs-patch/include/linux/ccsecurity.h (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #ifndef _LINUX_CCSECURITY_H
--- trunk/1.8.x/ccs-patch/include/linux/lsm2ccsecurity.h (revision 6841)
+++ trunk/1.8.x/ccs-patch/include/linux/lsm2ccsecurity.h (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #ifndef _LINUX_LSM2CCSECURITY_H
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.205.
1+This is TOMOYO Linux patch for kernel 4.14.206.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.205.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.206.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.14.205.orig/fs/exec.c
32-+++ linux-4.14.205/fs/exec.c
31+--- linux-4.14.206.orig/fs/exec.c
32++++ linux-4.14.206/fs/exec.c
3333 @@ -1679,7 +1679,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.14.205.orig/fs/open.c
43-+++ linux-4.14.205/fs/open.c
42+--- linux-4.14.206.orig/fs/open.c
43++++ linux-4.14.206/fs/open.c
4444 @@ -1193,6 +1193,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.14.205.orig/fs/proc/version.c
54-+++ linux-4.14.205/fs/proc/version.c
53+--- linux-4.14.206.orig/fs/proc/version.c
54++++ linux-4.14.206/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.14.205 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 4.14.206 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.205.orig/include/linux/init_task.h
67-+++ linux-4.14.205/include/linux/init_task.h
66+--- linux-4.14.206.orig/include/linux/init_task.h
67++++ linux-4.14.206/include/linux/init_task.h
6868 @@ -219,6 +219,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.14.205.orig/include/linux/sched.h
92-+++ linux-4.14.205/include/linux/sched.h
91+--- linux-4.14.206.orig/include/linux/sched.h
92++++ linux-4.14.206/include/linux/sched.h
9393 @@ -33,6 +33,7 @@ struct audit_context;
9494 struct backing_dev_info;
9595 struct bio_list;
@@ -109,8 +109,8 @@
109109
110110 /*
111111 * New fields for task_struct should be added above here, so that
112---- linux-4.14.205.orig/include/linux/security.h
113-+++ linux-4.14.205/include/linux/security.h
112+--- linux-4.14.206.orig/include/linux/security.h
113++++ linux-4.14.206/include/linux/security.h
114114 @@ -56,6 +56,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -331,8 +331,8 @@
331331 }
332332 #endif /* CONFIG_SECURITY_PATH */
333333
334---- linux-4.14.205.orig/include/net/ip.h
335-+++ linux-4.14.205/include/net/ip.h
334+--- linux-4.14.206.orig/include/net/ip.h
335++++ linux-4.14.206/include/net/ip.h
336336 @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337337 #ifdef CONFIG_SYSCTL
338338 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -351,8 +351,8 @@
351351 return 0;
352352 }
353353
354---- linux-4.14.205.orig/kernel/kexec.c
355-+++ linux-4.14.205/kernel/kexec.c
354+--- linux-4.14.206.orig/kernel/kexec.c
355++++ linux-4.14.206/kernel/kexec.c
356356 @@ -17,7 +17,7 @@
357357 #include <linux/syscalls.h>
358358 #include <linux/vmalloc.h>
@@ -371,8 +371,8 @@
371371
372372 /*
373373 * Verify we have a legal set of flags
374---- linux-4.14.205.orig/kernel/module.c
375-+++ linux-4.14.205/kernel/module.c
374+--- linux-4.14.206.orig/kernel/module.c
375++++ linux-4.14.206/kernel/module.c
376376 @@ -66,6 +66,7 @@
377377 #include <linux/audit.h>
378378 #include <uapi/linux/module.h>
@@ -399,8 +399,8 @@
399399
400400 return 0;
401401 }
402---- linux-4.14.205.orig/kernel/ptrace.c
403-+++ linux-4.14.205/kernel/ptrace.c
402+--- linux-4.14.206.orig/kernel/ptrace.c
403++++ linux-4.14.206/kernel/ptrace.c
404404 @@ -1153,6 +1153,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405405 {
406406 struct task_struct *child;
@@ -425,8 +425,8 @@
425425
426426 if (request == PTRACE_TRACEME) {
427427 ret = ptrace_traceme();
428---- linux-4.14.205.orig/kernel/reboot.c
429-+++ linux-4.14.205/kernel/reboot.c
428+--- linux-4.14.206.orig/kernel/reboot.c
429++++ linux-4.14.206/kernel/reboot.c
430430 @@ -16,6 +16,7 @@
431431 #include <linux/syscalls.h>
432432 #include <linux/syscore_ops.h>
@@ -444,8 +444,8 @@
444444
445445 /*
446446 * If pid namespaces are enabled and the current task is in a child
447---- linux-4.14.205.orig/kernel/sched/core.c
448-+++ linux-4.14.205/kernel/sched/core.c
447+--- linux-4.14.206.orig/kernel/sched/core.c
448++++ linux-4.14.206/kernel/sched/core.c
449449 @@ -3856,6 +3856,8 @@ int can_nice(const struct task_struct *p
450450 SYSCALL_DEFINE1(nice, int, increment)
451451 {
@@ -455,8 +455,8 @@
455455
456456 /*
457457 * Setpriority might change our priority at the same moment.
458---- linux-4.14.205.orig/kernel/signal.c
459-+++ linux-4.14.205/kernel/signal.c
458+--- linux-4.14.206.orig/kernel/signal.c
459++++ linux-4.14.206/kernel/signal.c
460460 @@ -3042,6 +3042,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461461 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462462 {
@@ -502,8 +502,8 @@
502502
503503 return do_send_specific(tgid, pid, sig, info);
504504 }
505---- linux-4.14.205.orig/kernel/sys.c
506-+++ linux-4.14.205/kernel/sys.c
505+--- linux-4.14.206.orig/kernel/sys.c
506++++ linux-4.14.206/kernel/sys.c
507507 @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 errno = -EFAULT;
535535 if (!copy_from_user(tmp, name, len)) {
536---- linux-4.14.205.orig/kernel/time/ntp.c
537-+++ linux-4.14.205/kernel/time/ntp.c
536+--- linux-4.14.206.orig/kernel/time/ntp.c
537++++ linux-4.14.206/kernel/time/ntp.c
538538 @@ -18,6 +18,7 @@
539539 #include <linux/module.h>
540540 #include <linux/rtc.h>
@@ -568,8 +568,8 @@
568568
569569 if (txc->modes & ADJ_NANO) {
570570 struct timespec ts;
571---- linux-4.14.205.orig/net/ipv4/raw.c
572-+++ linux-4.14.205/net/ipv4/raw.c
571+--- linux-4.14.206.orig/net/ipv4/raw.c
572++++ linux-4.14.206/net/ipv4/raw.c
573573 @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
574574 skb = skb_recv_datagram(sk, flags, noblock, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 copied = skb->len;
583583 if (len < copied) {
584---- linux-4.14.205.orig/net/ipv4/udp.c
585-+++ linux-4.14.205/net/ipv4/udp.c
584+--- linux-4.14.206.orig/net/ipv4/udp.c
585++++ linux-4.14.206/net/ipv4/udp.c
586586 @@ -1608,6 +1608,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.14.205.orig/net/ipv6/raw.c
596-+++ linux-4.14.205/net/ipv6/raw.c
595+--- linux-4.14.206.orig/net/ipv6/raw.c
596++++ linux-4.14.206/net/ipv6/raw.c
597597 @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk
598598 skb = skb_recv_datagram(sk, flags, noblock, &err);
599599 if (!skb)
@@ -605,8 +605,8 @@
605605
606606 copied = skb->len;
607607 if (copied > len) {
608---- linux-4.14.205.orig/net/ipv6/udp.c
609-+++ linux-4.14.205/net/ipv6/udp.c
608+--- linux-4.14.206.orig/net/ipv6/udp.c
609++++ linux-4.14.206/net/ipv6/udp.c
610610 @@ -371,6 +371,8 @@ try_again:
611611 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612612 if (!skb)
@@ -616,8 +616,8 @@
616616
617617 ulen = udp6_skb_len(skb);
618618 copied = len;
619---- linux-4.14.205.orig/net/socket.c
620-+++ linux-4.14.205/net/socket.c
619+--- linux-4.14.206.orig/net/socket.c
620++++ linux-4.14.206/net/socket.c
621621 @@ -1588,6 +1588,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622622 if (err < 0)
623623 goto out_fd;
@@ -629,8 +629,8 @@
629629 if (upeer_sockaddr) {
630630 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631631 &len, 2) < 0) {
632---- linux-4.14.205.orig/net/unix/af_unix.c
633-+++ linux-4.14.205/net/unix/af_unix.c
632+--- linux-4.14.206.orig/net/unix/af_unix.c
633++++ linux-4.14.206/net/unix/af_unix.c
634634 @@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc
635635 POLLOUT | POLLWRNORM |
636636 POLLWRBAND);
@@ -650,8 +650,8 @@
650650 mutex_unlock(&u->iolock);
651651 out:
652652 return err;
653---- linux-4.14.205.orig/security/Kconfig
654-+++ linux-4.14.205/security/Kconfig
653+--- linux-4.14.206.orig/security/Kconfig
654++++ linux-4.14.206/security/Kconfig
655655 @@ -263,5 +263,7 @@ config DEFAULT_SECURITY
656656 default "apparmor" if DEFAULT_SECURITY_APPARMOR
657657 default "" if DEFAULT_SECURITY_DAC
@@ -660,8 +660,8 @@
660660 +
661661 endmenu
662662
663---- linux-4.14.205.orig/security/Makefile
664-+++ linux-4.14.205/security/Makefile
663+--- linux-4.14.206.orig/security/Makefile
664++++ linux-4.14.206/security/Makefile
665665 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666666 # Object integrity file lists
667667 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -669,8 +669,8 @@
669669 +
670670 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
671671 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
672---- linux-4.14.205.orig/security/security.c
673-+++ linux-4.14.205/security/security.c
672+--- linux-4.14.206.orig/security/security.c
673++++ linux-4.14.206/security/security.c
674674 @@ -978,12 +978,19 @@ int security_file_open(struct file *file
675675
676676 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19.155.
1+This is TOMOYO Linux patch for kernel 4.19.157.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.155.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.157.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.19.155.orig/fs/exec.c
32-+++ linux-4.19.155/fs/exec.c
31+--- linux-4.19.157.orig/fs/exec.c
32++++ linux-4.19.157/fs/exec.c
3333 @@ -1707,7 +1707,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.19.155.orig/fs/open.c
43-+++ linux-4.19.155/fs/open.c
42+--- linux-4.19.157.orig/fs/open.c
43++++ linux-4.19.157/fs/open.c
4444 @@ -1196,6 +1196,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.19.155.orig/fs/proc/version.c
54-+++ linux-4.19.155/fs/proc/version.c
53+--- linux-4.19.157.orig/fs/proc/version.c
54++++ linux-4.19.157/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.19.155 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 4.19.157 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.19.155.orig/include/linux/sched.h
67-+++ linux-4.19.155/include/linux/sched.h
66+--- linux-4.19.157.orig/include/linux/sched.h
67++++ linux-4.19.157/include/linux/sched.h
6868 @@ -34,6 +34,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.19.155.orig/include/linux/security.h
88-+++ linux-4.19.155/include/linux/security.h
87+--- linux-4.19.157.orig/include/linux/security.h
88++++ linux-4.19.157/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.19.155.orig/include/net/ip.h
310-+++ linux-4.19.155/include/net/ip.h
309+--- linux-4.19.157.orig/include/net/ip.h
310++++ linux-4.19.157/include/net/ip.h
311311 @@ -301,6 +301,8 @@ void inet_get_local_port_range(struct ne
312312 #ifdef CONFIG_SYSCTL
313313 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -326,8 +326,8 @@
326326 return 0;
327327 }
328328
329---- linux-4.19.155.orig/init/init_task.c
330-+++ linux-4.19.155/init/init_task.c
329+--- linux-4.19.157.orig/init/init_task.c
330++++ linux-4.19.157/init/init_task.c
331331 @@ -179,6 +179,10 @@ struct task_struct init_task
332332 #ifdef CONFIG_SECURITY
333333 .security = NULL,
@@ -339,8 +339,8 @@
339339 };
340340 EXPORT_SYMBOL(init_task);
341341
342---- linux-4.19.155.orig/kernel/kexec.c
343-+++ linux-4.19.155/kernel/kexec.c
342+--- linux-4.19.157.orig/kernel/kexec.c
343++++ linux-4.19.157/kernel/kexec.c
344344 @@ -18,7 +18,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /* Permit LSMs and IMA to fail the kexec */
361361 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362---- linux-4.19.155.orig/kernel/module.c
363-+++ linux-4.19.155/kernel/module.c
362+--- linux-4.19.157.orig/kernel/module.c
363++++ linux-4.19.157/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,8 +387,8 @@
387387
388388 return 0;
389389 }
390---- linux-4.19.155.orig/kernel/ptrace.c
391-+++ linux-4.19.155/kernel/ptrace.c
390+--- linux-4.19.157.orig/kernel/ptrace.c
391++++ linux-4.19.157/kernel/ptrace.c
392392 @@ -1142,6 +1142,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.19.155.orig/kernel/reboot.c
417-+++ linux-4.19.155/kernel/reboot.c
416+--- linux-4.19.157.orig/kernel/reboot.c
417++++ linux-4.19.157/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,8 +432,8 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.19.155.orig/kernel/sched/core.c
436-+++ linux-4.19.155/kernel/sched/core.c
435+--- linux-4.19.157.orig/kernel/sched/core.c
436++++ linux-4.19.157/kernel/sched/core.c
437437 @@ -3989,6 +3989,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
@@ -443,9 +443,9 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.19.155.orig/kernel/signal.c
447-+++ linux-4.19.155/kernel/signal.c
448-@@ -3285,6 +3285,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
446+--- linux-4.19.157.orig/kernel/signal.c
447++++ linux-4.19.157/kernel/signal.c
448+@@ -3286,6 +3286,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449449 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450450 {
451451 struct siginfo info;
@@ -454,7 +454,7 @@
454454
455455 clear_siginfo(&info);
456456 info.si_signo = sig;
457-@@ -3355,6 +3357,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
457+@@ -3356,6 +3358,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
458458 /* This is only valid for single tasks */
459459 if (pid <= 0 || tgid <= 0)
460460 return -EINVAL;
@@ -463,7 +463,7 @@
463463
464464 return do_tkill(tgid, pid, sig);
465465 }
466-@@ -3371,6 +3375,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
466+@@ -3372,6 +3376,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
467467 /* This is only valid for single tasks */
468468 if (pid <= 0)
469469 return -EINVAL;
@@ -472,7 +472,7 @@
472472
473473 return do_tkill(0, pid, sig);
474474 }
475-@@ -3385,6 +3391,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
475+@@ -3386,6 +3392,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
476476 return -EPERM;
477477
478478 info->si_signo = sig;
@@ -481,7 +481,7 @@
481481
482482 /* POSIX.1b doesn't mention process groups. */
483483 return kill_proc_info(sig, info, pid);
484-@@ -3433,6 +3441,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
484+@@ -3434,6 +3442,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
485485 return -EPERM;
486486
487487 info->si_signo = sig;
@@ -490,8 +490,8 @@
490490
491491 return do_send_specific(tgid, pid, sig, info);
492492 }
493---- linux-4.19.155.orig/kernel/sys.c
494-+++ linux-4.19.155/kernel/sys.c
493+--- linux-4.19.157.orig/kernel/sys.c
494++++ linux-4.19.157/kernel/sys.c
495495 @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux-4.19.155.orig/kernel/time/timekeeping.c
525-+++ linux-4.19.155/kernel/time/timekeeping.c
524+--- linux-4.19.157.orig/kernel/time/timekeeping.c
525++++ linux-4.19.157/kernel/time/timekeeping.c
526526 @@ -26,6 +26,7 @@
527527 #include <linux/stop_machine.h>
528528 #include <linux/pvclock_gtod.h>
@@ -556,8 +556,8 @@
556556
557557 /*
558558 * Validate if a timespec/timeval used to inject a time
559---- linux-4.19.155.orig/net/ipv4/raw.c
560-+++ linux-4.19.155/net/ipv4/raw.c
559+--- linux-4.19.157.orig/net/ipv4/raw.c
560++++ linux-4.19.157/net/ipv4/raw.c
561561 @@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk,
562562 skb = skb_recv_datagram(sk, flags, noblock, &err);
563563 if (!skb)
@@ -569,8 +569,8 @@
569569
570570 copied = skb->len;
571571 if (len < copied) {
572---- linux-4.19.155.orig/net/ipv4/udp.c
573-+++ linux-4.19.155/net/ipv4/udp.c
572+--- linux-4.19.157.orig/net/ipv4/udp.c
573++++ linux-4.19.157/net/ipv4/udp.c
574574 @@ -1686,6 +1686,8 @@ try_again:
575575 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576576 if (!skb)
@@ -580,8 +580,8 @@
580580
581581 ulen = udp_skb_len(skb);
582582 copied = len;
583---- linux-4.19.155.orig/net/ipv6/raw.c
584-+++ linux-4.19.155/net/ipv6/raw.c
583+--- linux-4.19.157.orig/net/ipv6/raw.c
584++++ linux-4.19.157/net/ipv6/raw.c
585585 @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk
586586 skb = skb_recv_datagram(sk, flags, noblock, &err);
587587 if (!skb)
@@ -593,8 +593,8 @@
593593
594594 copied = skb->len;
595595 if (copied > len) {
596---- linux-4.19.155.orig/net/ipv6/udp.c
597-+++ linux-4.19.155/net/ipv6/udp.c
596+--- linux-4.19.157.orig/net/ipv6/udp.c
597++++ linux-4.19.157/net/ipv6/udp.c
598598 @@ -347,6 +347,8 @@ try_again:
599599 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600600 if (!skb)
@@ -604,8 +604,8 @@
604604
605605 ulen = udp6_skb_len(skb);
606606 copied = len;
607---- linux-4.19.155.orig/net/socket.c
608-+++ linux-4.19.155/net/socket.c
607+--- linux-4.19.157.orig/net/socket.c
608++++ linux-4.19.157/net/socket.c
609609 @@ -1590,6 +1590,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.19.155.orig/net/unix/af_unix.c
621-+++ linux-4.19.155/net/unix/af_unix.c
620+--- linux-4.19.157.orig/net/unix/af_unix.c
621++++ linux-4.19.157/net/unix/af_unix.c
622622 @@ -2158,6 +2158,10 @@ static int unix_dgram_recvmsg(struct soc
623623 EPOLLOUT | EPOLLWRNORM |
624624 EPOLLWRBAND);
@@ -638,8 +638,8 @@
638638 mutex_unlock(&u->iolock);
639639 out:
640640 return err;
641---- linux-4.19.155.orig/security/Kconfig
642-+++ linux-4.19.155/security/Kconfig
641+--- linux-4.19.157.orig/security/Kconfig
642++++ linux-4.19.157/security/Kconfig
643643 @@ -276,5 +276,7 @@ config DEFAULT_SECURITY
644644 default "apparmor" if DEFAULT_SECURITY_APPARMOR
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-4.19.155.orig/security/Makefile
652-+++ linux-4.19.155/security/Makefile
651+--- linux-4.19.157.orig/security/Makefile
652++++ linux-4.19.157/security/Makefile
653653 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
660---- linux-4.19.155.orig/security/security.c
661-+++ linux-4.19.155/security/security.c
660+--- linux-4.19.157.orig/security/security.c
661++++ linux-4.19.157/security/security.c
662662 @@ -984,12 +984,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.242.
1+This is TOMOYO Linux patch for kernel 4.4.243.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.242.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.243.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 150 insertions(+), 26 deletions(-)
3030
31---- linux-4.4.242.orig/fs/exec.c
32-+++ linux-4.4.242/fs/exec.c
31+--- linux-4.4.243.orig/fs/exec.c
32++++ linux-4.4.243/fs/exec.c
3333 @@ -1514,7 +1514,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.4.242.orig/fs/open.c
43-+++ linux-4.4.242/fs/open.c
42+--- linux-4.4.243.orig/fs/open.c
43++++ linux-4.4.243/fs/open.c
4444 @@ -1136,6 +1136,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.4.242.orig/fs/proc/version.c
54-+++ linux-4.4.242/fs/proc/version.c
53+--- linux-4.4.243.orig/fs/proc/version.c
54++++ linux-4.4.243/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.4.242 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 4.4.243 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.242.orig/include/linux/init_task.h
67-+++ linux-4.4.242/include/linux/init_task.h
66+--- linux-4.4.243.orig/include/linux/init_task.h
67++++ linux-4.4.243/include/linux/init_task.h
6868 @@ -191,6 +191,14 @@ extern struct task_group root_task_group
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.4.242.orig/include/linux/sched.h
92-+++ linux-4.4.242/include/linux/sched.h
91+--- linux-4.4.243.orig/include/linux/sched.h
92++++ linux-4.4.243/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.4.242.orig/include/linux/security.h
114-+++ linux-4.4.242/include/linux/security.h
113+--- linux-4.4.243.orig/include/linux/security.h
114++++ linux-4.4.243/include/linux/security.h
115115 @@ -53,6 +53,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.4.242.orig/include/net/ip.h
322-+++ linux-4.4.242/include/net/ip.h
321+--- linux-4.4.243.orig/include/net/ip.h
322++++ linux-4.4.243/include/net/ip.h
323323 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.4.242.orig/kernel/fork.c
342-+++ linux-4.4.242/kernel/fork.c
341+--- linux-4.4.243.orig/kernel/fork.c
342++++ linux-4.4.243/kernel/fork.c
343343 @@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.4.242.orig/kernel/kexec.c
370-+++ linux-4.4.242/kernel/kexec.c
369+--- linux-4.4.243.orig/kernel/kexec.c
370++++ linux-4.4.243/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.4.242.orig/kernel/module.c
390-+++ linux-4.4.242/kernel/module.c
389+--- linux-4.4.243.orig/kernel/module.c
390++++ linux-4.4.243/kernel/module.c
391391 @@ -61,6 +61,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.4.242.orig/kernel/ptrace.c
418-+++ linux-4.4.242/kernel/ptrace.c
417+--- linux-4.4.243.orig/kernel/ptrace.c
418++++ linux-4.4.243/kernel/ptrace.c
419419 @@ -1109,6 +1109,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.4.242.orig/kernel/reboot.c
444-+++ linux-4.4.242/kernel/reboot.c
443+--- linux-4.4.243.orig/kernel/reboot.c
444++++ linux-4.4.243/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.4.242.orig/kernel/sched/core.c
463-+++ linux-4.4.242/kernel/sched/core.c
462+--- linux-4.4.243.orig/kernel/sched/core.c
463++++ linux-4.4.243/kernel/sched/core.c
464464 @@ -3550,6 +3550,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.4.242.orig/kernel/signal.c
474-+++ linux-4.4.242/kernel/signal.c
473+--- linux-4.4.243.orig/kernel/signal.c
474++++ linux-4.4.243/kernel/signal.c
475475 @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.4.242.orig/kernel/sys.c
521-+++ linux-4.4.242/kernel/sys.c
520+--- linux-4.4.243.orig/kernel/sys.c
521++++ linux-4.4.243/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.4.242.orig/kernel/time/ntp.c
552-+++ linux-4.4.242/kernel/time/ntp.c
551+--- linux-4.4.243.orig/kernel/time/ntp.c
552++++ linux-4.4.243/kernel/time/ntp.c
553553 @@ -16,6 +16,7 @@
554554 #include <linux/mm.h>
555555 #include <linux/module.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.4.242.orig/net/ipv4/raw.c
587-+++ linux-4.4.242/net/ipv4/raw.c
586+--- linux-4.4.243.orig/net/ipv4/raw.c
587++++ linux-4.4.243/net/ipv4/raw.c
588588 @@ -749,6 +749,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.4.242.orig/net/ipv4/udp.c
600-+++ linux-4.4.242/net/ipv4/udp.c
599+--- linux-4.4.243.orig/net/ipv4/udp.c
600++++ linux-4.4.243/net/ipv4/udp.c
601601 @@ -1289,6 +1289,10 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -609,8 +609,8 @@
609609
610610 ulen = skb->len - sizeof(struct udphdr);
611611 copied = len;
612---- linux-4.4.242.orig/net/ipv6/raw.c
613-+++ linux-4.4.242/net/ipv6/raw.c
612+--- linux-4.4.243.orig/net/ipv6/raw.c
613++++ linux-4.4.243/net/ipv6/raw.c
614614 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
615615 skb = skb_recv_datagram(sk, flags, noblock, &err);
616616 if (!skb)
@@ -622,8 +622,8 @@
622622
623623 copied = skb->len;
624624 if (copied > len) {
625---- linux-4.4.242.orig/net/ipv6/udp.c
626-+++ linux-4.4.242/net/ipv6/udp.c
625+--- linux-4.4.243.orig/net/ipv6/udp.c
626++++ linux-4.4.243/net/ipv6/udp.c
627627 @@ -417,6 +417,10 @@ try_again:
628628 &peeked, &off, &err);
629629 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = skb->len - sizeof(struct udphdr);
637637 copied = len;
638---- linux-4.4.242.orig/net/socket.c
639-+++ linux-4.4.242/net/socket.c
638+--- linux-4.4.243.orig/net/socket.c
639++++ linux-4.4.243/net/socket.c
640640 @@ -1465,6 +1465,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650650 &len, 2) < 0) {
651---- linux-4.4.242.orig/net/unix/af_unix.c
652-+++ linux-4.4.242/net/unix/af_unix.c
651+--- linux-4.4.243.orig/net/unix/af_unix.c
652++++ linux-4.4.243/net/unix/af_unix.c
653653 @@ -2160,6 +2160,10 @@ static int unix_dgram_recvmsg(struct soc
654654 wake_up_interruptible_sync_poll(&u->peer_wait,
655655 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -661,8 +661,8 @@
661661 if (msg->msg_name)
662662 unix_copy_addr(msg, skb->sk);
663663
664---- linux-4.4.242.orig/security/Kconfig
665-+++ linux-4.4.242/security/Kconfig
664+--- linux-4.4.243.orig/security/Kconfig
665++++ linux-4.4.243/security/Kconfig
666666 @@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667667 default "apparmor" if DEFAULT_SECURITY_APPARMOR
668668 default "" if DEFAULT_SECURITY_DAC
@@ -671,8 +671,8 @@
671671 +
672672 endmenu
673673
674---- linux-4.4.242.orig/security/Makefile
675-+++ linux-4.4.242/security/Makefile
674+--- linux-4.4.243.orig/security/Makefile
675++++ linux-4.4.243/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.242.
1+This is TOMOYO Linux patch for kernel 4.9.243.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.242.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.243.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 147 insertions(+), 26 deletions(-)
3030
31---- linux-4.9.242.orig/fs/exec.c
32-+++ linux-4.9.242/fs/exec.c
31+--- linux-4.9.243.orig/fs/exec.c
32++++ linux-4.9.243/fs/exec.c
3333 @@ -1662,7 +1662,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.9.242.orig/fs/open.c
43-+++ linux-4.9.242/fs/open.c
42+--- linux-4.9.243.orig/fs/open.c
43++++ linux-4.9.243/fs/open.c
4444 @@ -1173,6 +1173,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.9.242.orig/fs/proc/version.c
54-+++ linux-4.9.242/fs/proc/version.c
53+--- linux-4.9.243.orig/fs/proc/version.c
54++++ linux-4.9.243/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.9.242 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 4.9.243 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.242.orig/include/linux/init_task.h
67-+++ linux-4.9.242/include/linux/init_task.h
66+--- linux-4.9.243.orig/include/linux/init_task.h
67++++ linux-4.9.243/include/linux/init_task.h
6868 @@ -193,6 +193,14 @@ extern struct task_group root_task_group
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.9.242.orig/include/linux/sched.h
92-+++ linux-4.9.242/include/linux/sched.h
91+--- linux-4.9.243.orig/include/linux/sched.h
92++++ linux-4.9.243/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.9.242.orig/include/linux/security.h
114-+++ linux-4.9.242/include/linux/security.h
113+--- linux-4.9.243.orig/include/linux/security.h
114++++ linux-4.9.243/include/linux/security.h
115115 @@ -55,6 +55,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.9.242.orig/include/net/ip.h
322-+++ linux-4.9.242/include/net/ip.h
321+--- linux-4.9.243.orig/include/net/ip.h
322++++ linux-4.9.243/include/net/ip.h
323323 @@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.9.242.orig/kernel/fork.c
342-+++ linux-4.9.242/kernel/fork.c
341+--- linux-4.9.243.orig/kernel/fork.c
342++++ linux-4.9.243/kernel/fork.c
343343 @@ -395,6 +395,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.9.242.orig/kernel/kexec.c
370-+++ linux-4.9.242/kernel/kexec.c
369+--- linux-4.9.243.orig/kernel/kexec.c
370++++ linux-4.9.243/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.9.242.orig/kernel/module.c
390-+++ linux-4.9.242/kernel/module.c
389+--- linux-4.9.243.orig/kernel/module.c
390++++ linux-4.9.243/kernel/module.c
391391 @@ -63,6 +63,7 @@
392392 #include <linux/dynamic_debug.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.9.242.orig/kernel/ptrace.c
418-+++ linux-4.9.242/kernel/ptrace.c
417+--- linux-4.9.243.orig/kernel/ptrace.c
418++++ linux-4.9.243/kernel/ptrace.c
419419 @@ -1146,6 +1146,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.9.242.orig/kernel/reboot.c
444-+++ linux-4.9.242/kernel/reboot.c
443+--- linux-4.9.243.orig/kernel/reboot.c
444++++ linux-4.9.243/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.9.242.orig/kernel/sched/core.c
463-+++ linux-4.9.242/kernel/sched/core.c
462+--- linux-4.9.243.orig/kernel/sched/core.c
463++++ linux-4.9.243/kernel/sched/core.c
464464 @@ -3814,6 +3814,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.9.242.orig/kernel/signal.c
474-+++ linux-4.9.242/kernel/signal.c
473+--- linux-4.9.243.orig/kernel/signal.c
474++++ linux-4.9.243/kernel/signal.c
475475 @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.9.242.orig/kernel/sys.c
521-+++ linux-4.9.242/kernel/sys.c
520+--- linux-4.9.243.orig/kernel/sys.c
521++++ linux-4.9.243/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.9.242.orig/kernel/time/ntp.c
552-+++ linux-4.9.242/kernel/time/ntp.c
551+--- linux-4.9.243.orig/kernel/time/ntp.c
552++++ linux-4.9.243/kernel/time/ntp.c
553553 @@ -17,6 +17,7 @@
554554 #include <linux/module.h>
555555 #include <linux/rtc.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.9.242.orig/net/ipv4/raw.c
587-+++ linux-4.9.242/net/ipv4/raw.c
586+--- linux-4.9.243.orig/net/ipv4/raw.c
587++++ linux-4.9.243/net/ipv4/raw.c
588588 @@ -746,6 +746,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.9.242.orig/net/ipv4/udp.c
600-+++ linux-4.9.242/net/ipv4/udp.c
599+--- linux-4.9.243.orig/net/ipv4/udp.c
600++++ linux-4.9.243/net/ipv4/udp.c
601601 @@ -1271,6 +1271,8 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len;
609609 copied = len;
610---- linux-4.9.242.orig/net/ipv6/raw.c
611-+++ linux-4.9.242/net/ipv6/raw.c
610+--- linux-4.9.243.orig/net/ipv6/raw.c
611++++ linux-4.9.243/net/ipv6/raw.c
612612 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
613613 skb = skb_recv_datagram(sk, flags, noblock, &err);
614614 if (!skb)
@@ -620,8 +620,8 @@
620620
621621 copied = skb->len;
622622 if (copied > len) {
623---- linux-4.9.242.orig/net/ipv6/udp.c
624-+++ linux-4.9.242/net/ipv6/udp.c
623+--- linux-4.9.243.orig/net/ipv6/udp.c
624++++ linux-4.9.243/net/ipv6/udp.c
625625 @@ -348,6 +348,8 @@ try_again:
626626 &peeked, &off, &err);
627627 if (!skb)
@@ -631,8 +631,8 @@
631631
632632 ulen = skb->len;
633633 copied = len;
634---- linux-4.9.242.orig/net/socket.c
635-+++ linux-4.9.242/net/socket.c
634+--- linux-4.9.243.orig/net/socket.c
635++++ linux-4.9.243/net/socket.c
636636 @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637637 if (err < 0)
638638 goto out_fd;
@@ -644,8 +644,8 @@
644644 if (upeer_sockaddr) {
645645 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646646 &len, 2) < 0) {
647---- linux-4.9.242.orig/net/unix/af_unix.c
648-+++ linux-4.9.242/net/unix/af_unix.c
647+--- linux-4.9.243.orig/net/unix/af_unix.c
648++++ linux-4.9.243/net/unix/af_unix.c
649649 @@ -2169,6 +2169,10 @@ static int unix_dgram_recvmsg(struct soc
650650 POLLOUT | POLLWRNORM |
651651 POLLWRBAND);
@@ -665,8 +665,8 @@
665665 mutex_unlock(&u->iolock);
666666 out:
667667 return err;
668---- linux-4.9.242.orig/security/Kconfig
669-+++ linux-4.9.242/security/Kconfig
668+--- linux-4.9.243.orig/security/Kconfig
669++++ linux-4.9.243/security/Kconfig
670670 @@ -214,5 +214,7 @@ config DEFAULT_SECURITY
671671 default "apparmor" if DEFAULT_SECURITY_APPARMOR
672672 default "" if DEFAULT_SECURITY_DAC
@@ -675,8 +675,8 @@
675675 +
676676 endmenu
677677
678---- linux-4.9.242.orig/security/Makefile
679-+++ linux-4.9.242/security/Makefile
678+--- linux-4.9.243.orig/security/Makefile
679++++ linux-4.9.243/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.4.75.
1+This is TOMOYO Linux patch for kernel 5.4.77.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.75.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.77.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.4.75.orig/fs/exec.c
32-+++ linux-5.4.75/fs/exec.c
31+--- linux-5.4.77.orig/fs/exec.c
32++++ linux-5.4.77/fs/exec.c
3333 @@ -1730,7 +1730,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-5.4.75.orig/fs/open.c
43-+++ linux-5.4.75/fs/open.c
42+--- linux-5.4.77.orig/fs/open.c
43++++ linux-5.4.77/fs/open.c
4444 @@ -1205,6 +1205,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.4.75.orig/fs/proc/version.c
54-+++ linux-5.4.75/fs/proc/version.c
53+--- linux-5.4.77.orig/fs/proc/version.c
54++++ linux-5.4.77/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.4.75 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 5.4.77 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.4.75.orig/include/linux/sched.h
67-+++ linux-5.4.75/include/linux/sched.h
66+--- linux-5.4.77.orig/include/linux/sched.h
67++++ linux-5.4.77/include/linux/sched.h
6868 @@ -38,6 +38,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.4.75.orig/include/linux/security.h
88-+++ linux-5.4.75/include/linux/security.h
87+--- linux-5.4.77.orig/include/linux/security.h
88++++ linux-5.4.77/include/linux/security.h
8989 @@ -57,6 +57,7 @@ struct mm_struct;
9090 struct fs_context;
9191 struct fs_parameter;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.4.75.orig/include/net/ip.h
319-+++ linux-5.4.75/include/net/ip.h
318+--- linux-5.4.77.orig/include/net/ip.h
319++++ linux-5.4.77/include/net/ip.h
320320 @@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -335,8 +335,8 @@
335335 return 0;
336336 }
337337
338---- linux-5.4.75.orig/init/init_task.c
339-+++ linux-5.4.75/init/init_task.c
338+--- linux-5.4.77.orig/init/init_task.c
339++++ linux-5.4.77/init/init_task.c
340340 @@ -182,6 +182,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECURITY
342342 .security = NULL,
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.4.75.orig/kernel/kexec.c
352-+++ linux-5.4.75/kernel/kexec.c
351+--- linux-5.4.77.orig/kernel/kexec.c
352++++ linux-5.4.77/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.4.75.orig/kernel/module.c
372-+++ linux-5.4.75/kernel/module.c
371+--- linux-5.4.77.orig/kernel/module.c
372++++ linux-5.4.77/kernel/module.c
373373 @@ -55,6 +55,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.4.75.orig/kernel/ptrace.c
400-+++ linux-5.4.75/kernel/ptrace.c
399+--- linux-5.4.77.orig/kernel/ptrace.c
400++++ linux-5.4.77/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.4.75.orig/kernel/reboot.c
426-+++ linux-5.4.75/kernel/reboot.c
425+--- linux-5.4.77.orig/kernel/reboot.c
426++++ linux-5.4.77/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.4.75.orig/kernel/sched/core.c
445-+++ linux-5.4.75/kernel/sched/core.c
444+--- linux-5.4.77.orig/kernel/sched/core.c
445++++ linux-5.4.77/kernel/sched/core.c
446446 @@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,9 +452,9 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.4.75.orig/kernel/signal.c
456-+++ linux-5.4.75/kernel/signal.c
457-@@ -3643,6 +3643,8 @@ static inline void prepare_kill_siginfo(
455+--- linux-5.4.77.orig/kernel/signal.c
456++++ linux-5.4.77/kernel/signal.c
457+@@ -3644,6 +3644,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
460460 struct kernel_siginfo info;
@@ -463,7 +463,7 @@
463463
464464 prepare_kill_siginfo(sig, &info);
465465
466-@@ -3741,6 +3743,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
466+@@ -3742,6 +3744,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467467 if (!access_pidfd_pidns(pid))
468468 goto err;
469469
@@ -485,7 +485,7 @@
485485 if (info) {
486486 ret = copy_siginfo_from_user_any(&kinfo, info);
487487 if (unlikely(ret))
488-@@ -3825,6 +3842,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
488+@@ -3826,6 +3843,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489489 /* This is only valid for single tasks */
490490 if (pid <= 0 || tgid <= 0)
491491 return -EINVAL;
@@ -494,7 +494,7 @@
494494
495495 return do_tkill(tgid, pid, sig);
496496 }
497-@@ -3841,6 +3860,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
497+@@ -3842,6 +3861,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498498 /* This is only valid for single tasks */
499499 if (pid <= 0)
500500 return -EINVAL;
@@ -503,7 +503,7 @@
503503
504504 return do_tkill(0, pid, sig);
505505 }
506-@@ -3853,6 +3874,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
506+@@ -3854,6 +3875,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507507 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
508508 (task_pid_vnr(current) != pid))
509509 return -EPERM;
@@ -512,7 +512,7 @@
512512
513513 /* POSIX.1b doesn't mention process groups. */
514514 return kill_proc_info(sig, info, pid);
515-@@ -3900,6 +3923,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
515+@@ -3901,6 +3924,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516516 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
517517 (task_pid_vnr(current) != pid))
518518 return -EPERM;
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.4.75.orig/kernel/sys.c
525-+++ linux-5.4.75/kernel/sys.c
524+--- linux-5.4.77.orig/kernel/sys.c
525++++ linux-5.4.77/kernel/sys.c
526526 @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.4.75.orig/kernel/time/timekeeping.c
556-+++ linux-5.4.75/kernel/time/timekeeping.c
555+--- linux-5.4.77.orig/kernel/time/timekeeping.c
556++++ linux-5.4.77/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.4.75.orig/net/ipv4/raw.c
591-+++ linux-5.4.75/net/ipv4/raw.c
590+--- linux-5.4.77.orig/net/ipv4/raw.c
591++++ linux-5.4.77/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.4.75.orig/net/ipv4/udp.c
604-+++ linux-5.4.75/net/ipv4/udp.c
603+--- linux-5.4.77.orig/net/ipv4/udp.c
604++++ linux-5.4.77/net/ipv4/udp.c
605605 @@ -1744,6 +1744,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.4.75.orig/net/ipv6/raw.c
615-+++ linux-5.4.75/net/ipv6/raw.c
614+--- linux-5.4.77.orig/net/ipv6/raw.c
615++++ linux-5.4.77/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.4.75.orig/net/ipv6/udp.c
628-+++ linux-5.4.75/net/ipv6/udp.c
627+--- linux-5.4.77.orig/net/ipv6/udp.c
628++++ linux-5.4.77/net/ipv6/udp.c
629629 @@ -291,6 +291,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.4.75.orig/net/socket.c
639-+++ linux-5.4.75/net/socket.c
638+--- linux-5.4.77.orig/net/socket.c
639++++ linux-5.4.77/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.4.75.orig/net/unix/af_unix.c
652-+++ linux-5.4.75/net/unix/af_unix.c
651+--- linux-5.4.77.orig/net/unix/af_unix.c
652++++ linux-5.4.77/net/unix/af_unix.c
653653 @@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.4.75.orig/security/Kconfig
673-+++ linux-5.4.75/security/Kconfig
672+--- linux-5.4.77.orig/security/Kconfig
673++++ linux-5.4.77/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.4.75.orig/security/Makefile
683-+++ linux-5.4.75/security/Makefile
682+--- linux-5.4.77.orig/security/Makefile
683++++ linux-5.4.77/security/Makefile
684684 @@ -34,3 +34,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.4.75.orig/security/security.c
692-+++ linux-5.4.75/security/security.c
691+--- linux-5.4.77.orig/security/security.c
692++++ linux-5.4.77/security/security.c
693693 @@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.9.diff (revision 6841)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.9.diff (revision 6842)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.9.6.
1+This is TOMOYO Linux patch for kernel 5.9.8.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.6.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.9.6.orig/fs/exec.c
32-+++ linux-5.9.6/fs/exec.c
31+--- linux-5.9.8.orig/fs/exec.c
32++++ linux-5.9.8/fs/exec.c
3333 @@ -1948,7 +1948,7 @@ static int bprm_execve(struct linux_binp
3434 if (retval)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-5.9.6.orig/fs/open.c
43-+++ linux-5.9.6/fs/open.c
42+--- linux-5.9.8.orig/fs/open.c
43++++ linux-5.9.8/fs/open.c
4444 @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.9.6.orig/fs/proc/version.c
54-+++ linux-5.9.6/fs/proc/version.c
53+--- linux-5.9.8.orig/fs/proc/version.c
54++++ linux-5.9.8/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.9.6 2020/11/10\n");
62++ printk(KERN_INFO "Hook version: 5.9.8 2020/11/11\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.9.6.orig/include/linux/sched.h
67-+++ linux-5.9.6/include/linux/sched.h
66+--- linux-5.9.8.orig/include/linux/sched.h
67++++ linux-5.9.8/include/linux/sched.h
6868 @@ -41,6 +41,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.9.6.orig/include/linux/security.h
88-+++ linux-5.9.6/include/linux/security.h
87+--- linux-5.9.8.orig/include/linux/security.h
88++++ linux-5.9.8/include/linux/security.h
8989 @@ -58,6 +58,7 @@ struct fs_parameter;
9090 enum fs_value_type;
9191 struct watch;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.9.6.orig/include/net/ip.h
319-+++ linux-5.9.6/include/net/ip.h
318+--- linux-5.9.8.orig/include/net/ip.h
319++++ linux-5.9.8/include/net/ip.h
320320 @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
@@ -335,8 +335,8 @@
335335 return false;
336336 }
337337
338---- linux-5.9.6.orig/init/init_task.c
339-+++ linux-5.9.6/init/init_task.c
338+--- linux-5.9.8.orig/init/init_task.c
339++++ linux-5.9.8/init/init_task.c
340340 @@ -212,6 +212,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECCOMP
342342 .seccomp = { .filter_count = ATOMIC_INIT(0) },
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.9.6.orig/kernel/kexec.c
352-+++ linux-5.9.6/kernel/kexec.c
351+--- linux-5.9.8.orig/kernel/kexec.c
352++++ linux-5.9.8/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.9.6.orig/kernel/module.c
372-+++ linux-5.9.6/kernel/module.c
371+--- linux-5.9.8.orig/kernel/module.c
372++++ linux-5.9.8/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.9.6.orig/kernel/ptrace.c
400-+++ linux-5.9.6/kernel/ptrace.c
399+--- linux-5.9.8.orig/kernel/ptrace.c
400++++ linux-5.9.8/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.9.6.orig/kernel/reboot.c
426-+++ linux-5.9.6/kernel/reboot.c
425+--- linux-5.9.8.orig/kernel/reboot.c
426++++ linux-5.9.8/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.9.6.orig/kernel/sched/core.c
445-+++ linux-5.9.6/kernel/sched/core.c
444+--- linux-5.9.8.orig/kernel/sched/core.c
445++++ linux-5.9.8/kernel/sched/core.c
446446 @@ -5030,6 +5030,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,9 +452,9 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.9.6.orig/kernel/signal.c
456-+++ linux-5.9.6/kernel/signal.c
457-@@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
455+--- linux-5.9.8.orig/kernel/signal.c
456++++ linux-5.9.8/kernel/signal.c
457+@@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
460460 struct kernel_siginfo info;
@@ -463,7 +463,7 @@
463463
464464 prepare_kill_siginfo(sig, &info);
465465
466-@@ -3755,6 +3757,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
466+@@ -3756,6 +3758,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467467 if (!access_pidfd_pidns(pid))
468468 goto err;
469469
@@ -485,7 +485,7 @@
485485 if (info) {
486486 ret = copy_siginfo_from_user_any(&kinfo, info);
487487 if (unlikely(ret))
488-@@ -3839,6 +3856,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
488+@@ -3840,6 +3857,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489489 /* This is only valid for single tasks */
490490 if (pid <= 0 || tgid <= 0)
491491 return -EINVAL;
@@ -494,7 +494,7 @@
494494
495495 return do_tkill(tgid, pid, sig);
496496 }
497-@@ -3855,6 +3874,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
497+@@ -3856,6 +3875,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498498 /* This is only valid for single tasks */
499499 if (pid <= 0)
500500 return -EINVAL;
@@ -503,7 +503,7 @@
503503
504504 return do_tkill(0, pid, sig);
505505 }
506-@@ -3867,6 +3888,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
506+@@ -3868,6 +3889,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507507 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
508508 (task_pid_vnr(current) != pid))
509509 return -EPERM;
@@ -512,7 +512,7 @@
512512
513513 /* POSIX.1b doesn't mention process groups. */
514514 return kill_proc_info(sig, info, pid);
515-@@ -3914,6 +3937,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
515+@@ -3915,6 +3938,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516516 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
517517 (task_pid_vnr(current) != pid))
518518 return -EPERM;
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.9.6.orig/kernel/sys.c
525-+++ linux-5.9.6/kernel/sys.c
524+--- linux-5.9.8.orig/kernel/sys.c
525++++ linux-5.9.8/kernel/sys.c
526526 @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.9.6.orig/kernel/time/timekeeping.c
556-+++ linux-5.9.6/kernel/time/timekeeping.c
555+--- linux-5.9.8.orig/kernel/time/timekeeping.c
556++++ linux-5.9.8/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.9.6.orig/net/ipv4/raw.c
591-+++ linux-5.9.6/net/ipv4/raw.c
590+--- linux-5.9.8.orig/net/ipv4/raw.c
591++++ linux-5.9.8/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.9.6.orig/net/ipv4/udp.c
604-+++ linux-5.9.6/net/ipv4/udp.c
603+--- linux-5.9.8.orig/net/ipv4/udp.c
604++++ linux-5.9.8/net/ipv4/udp.c
605605 @@ -1801,6 +1801,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.9.6.orig/net/ipv6/raw.c
615-+++ linux-5.9.6/net/ipv6/raw.c
614+--- linux-5.9.8.orig/net/ipv6/raw.c
615++++ linux-5.9.8/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.9.6.orig/net/ipv6/udp.c
628-+++ linux-5.9.6/net/ipv6/udp.c
627+--- linux-5.9.8.orig/net/ipv6/udp.c
628++++ linux-5.9.8/net/ipv6/udp.c
629629 @@ -343,6 +343,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.9.6.orig/net/socket.c
639-+++ linux-5.9.6/net/socket.c
638+--- linux-5.9.8.orig/net/socket.c
639++++ linux-5.9.8/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.9.6.orig/net/unix/af_unix.c
652-+++ linux-5.9.6/net/unix/af_unix.c
651+--- linux-5.9.8.orig/net/unix/af_unix.c
652++++ linux-5.9.8/net/unix/af_unix.c
653653 @@ -2130,6 +2130,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.9.6.orig/security/Kconfig
673-+++ linux-5.9.6/security/Kconfig
672+--- linux-5.9.8.orig/security/Kconfig
673++++ linux-5.9.8/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.9.6.orig/security/Makefile
683-+++ linux-5.9.6/security/Makefile
682+--- linux-5.9.8.orig/security/Makefile
683++++ linux-5.9.8/security/Makefile
684684 @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.9.6.orig/security/security.c
692-+++ linux-5.9.6/security/security.c
691+--- linux-5.9.8.orig/security/security.c
692++++ linux-5.9.8/security/security.c
693693 @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/security/ccsecurity/gc.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/gc.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include "internal.h"
--- trunk/1.8.x/ccs-patch/security/ccsecurity/internal.h (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/internal.h (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #ifndef _SECURITY_CCSECURITY_INTERNAL_H
--- trunk/1.8.x/ccs-patch/security/ccsecurity/load_policy.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/load_policy.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include <linux/version.h>
--- trunk/1.8.x/ccs-patch/security/ccsecurity/lsm2ccsecurity.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/lsm2ccsecurity.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include <linux/path.h>
--- trunk/1.8.x/ccs-patch/security/ccsecurity/memory.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/memory.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7 2020/05/05
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include "internal.h"
--- trunk/1.8.x/ccs-patch/security/ccsecurity/permission.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/permission.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7+ 2020/08/20
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include "internal.h"
--- trunk/1.8.x/ccs-patch/security/ccsecurity/policy_io.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/policy_io.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7+ 2020/08/20
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include "internal.h"
@@ -2496,7 +2496,7 @@
24962496 struct ccs_domain_info *domain;
24972497 const int idx = ccs_read_lock();
24982498 ccs_policy_loaded = true;
2499- printk(KERN_INFO "CCSecurity: 1.8.7+ 2020/08/20\n");
2499+ printk(KERN_INFO "CCSecurity: 1.8.8 2020/11/11\n");
25002500 list_for_each_entry_srcu(domain, &ccs_domain_list, list, &ccs_ss) {
25012501 const u8 profile = domain->profile;
25022502 struct ccs_policy_namespace *ns = domain->ns;
@@ -5180,7 +5180,7 @@
51805180 {
51815181 if (head->r.eof)
51825182 return;
5183- ccs_set_string(head, "1.8.7");
5183+ ccs_set_string(head, "1.8.8");
51845184 head->r.eof = true;
51855185 }
51865186
--- trunk/1.8.x/ccs-patch/security/ccsecurity/realpath.c (revision 6841)
+++ trunk/1.8.x/ccs-patch/security/ccsecurity/realpath.c (revision 6842)
@@ -3,7 +3,7 @@
33 *
44 * Copyright (C) 2005-2012 NTT DATA CORPORATION
55 *
6- * Version: 1.8.7+ 2020/08/20
6+ * Version: 1.8.8 2020/11/11
77 */
88
99 #include "internal.h"
--- trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.18-398.1.AXS3.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/asianux/SOURCES/ || die "Can't chdir to /usr/src/asianux/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -33,7 +33,7 @@
3333 %define rpmversion 2.6.%{sublevel}
3434 # %dist is defined in Asianux VPBS
3535 -%define release %{revision}.1%{dist}
36-+%define release %{revision}.1%{dist}_tomoyo_1.8.7p2
36++%define release %{revision}.1%{dist}_tomoyo_1.8.8
3737 %define signmodules 0
3838 %define xen_hv_cset 15502
3939 %define xen_abi_ver 3.1
@@ -61,7 +61,7 @@
6161 # end of Asianux patches
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.18-asianux-3.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.4.21-63.EL.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -33,7 +33,7 @@
3333 # adding some text to the end of the version number.
3434 #
3535 -%define release 63.EL
36-+%define release 63.EL_tomoyo_1.8.7p2
36++%define release 63.EL_tomoyo_1.8.8
3737 %define sublevel 21
3838 %define kversion 2.4.%{sublevel}
3939 # /usr/src/%{kslnk} -> /usr/src/linux-%{KVERREL}
@@ -51,7 +51,7 @@
5151 # END OF PATCH APPLICATIONS
5252
5353 +# TOMOYO Linux
54-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
54++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
5555 +patch -sp1 < patches/ccs-patch-2.4.21-centos-3.diff
5656 +
5757 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.9-103.EL.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -33,7 +33,7 @@
3333 # adding some text to the end of the version number.
3434 #
3535 -%define release 103.EL
36-+%define release 103.EL_tomoyo_1.8.7p2
36++%define release 103.EL_tomoyo_1.8.8
3737 %define sublevel 9
3838 %define kversion 2.6.%{sublevel}
3939 %define rpmversion 2.6.%{sublevel}
@@ -61,7 +61,7 @@
6161 # END OF PATCH APPLICATIONS
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.9-centos-4.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.18-419.el5.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -33,7 +33,7 @@
3333 # by setting the define to ".local" or ".bz123456"
3434 #
3535 -#% define buildid
36-+%define buildid _tomoyo_1.8.7p2
36++%define buildid _tomoyo_1.8.8
3737 #
3838 %define sublevel 18
3939 %define stablerev 4
@@ -61,7 +61,7 @@
6161 %endif
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.18-centos-5.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.32-754.35.1.el6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -33,7 +33,7 @@
3333 # by setting the define to ".local" or ".bz123456"
3434 #
3535 -# % define buildid .local
36-+%define buildid _tomoyo_1.8.7p2
36++%define buildid _tomoyo_1.8.8
3737
3838 %define distro_build 754.35.1
3939 %define kabi_build 754
@@ -69,7 +69,7 @@
6969 ApplyOptionalPatch linux-kernel-test.patch
7070
7171 +# TOMOYO Linux
72-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
72++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
7373 +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
7474 +
7575 # Any further pre-build tree manipulations happen here.
--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -33,7 +33,7 @@
3333 %define dist .el7
3434
3535 -# % define buildid .local
36-+%define buildid _tomoyo_1.8.7p2
36++%define buildid _tomoyo_1.8.8
3737
3838 # If there's no unversioned python, select version explicitly,
3939 # so it's possible to at least do rh-srpm.
@@ -69,7 +69,7 @@
6969 ApplyOptionalPatch debrand-rh-i686-cpu.patch
7070
7171 +# TOMOYO Linux
72-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
72++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
7373 +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
7474 +
7575 # Any further pre-build tree manipulations happen here.
--- trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-4.18.0-193.28.1.el8_2.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -33,7 +33,7 @@
3333 %endif
3434
3535 -# define buildid .local
36-+%define buildid _tomoyo_1.8.7p2
36++%define buildid _tomoyo_1.8.8
3737
3838 %define rpmversion 4.18.0
3939 %define pkgrelease 193.28.1.el8_2
@@ -42,7 +42,7 @@
4242 # END OF PATCH APPLICATIONS
4343
4444 +# TOMOYO Linux
45-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
45++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
4646 +patch -sp1 < patches/ccs-patch-4.18-centos-8.diff
4747 +
4848 # Any further pre-build tree manipulations happen here.
--- trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6842)
@@ -38,9 +38,9 @@
3838 # Download TOMOYO Linux patches.
3939 mkdir -p ~/rpmbuild/SOURCES/
4040 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
41-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
41+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
4242 then
43- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
43+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
4444 fi
4545
4646 # Install kernel source packages.
@@ -52,7 +52,7 @@
5252
5353 # Apply patches and create kernel config.
5454 cd linux-source-2.6.32 || die "Can't chdir to linux-source-2.6.32/ ."
55-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
55+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
5656 patch -p1 < patches/ccs-patch-2.6.32-debian-squeeze.diff || die "Can't apply patch."
5757 cat /boot/config-2.6.32-5-686 config.ccs > .config || die "Can't create config."
5858
--- trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6842)
@@ -23,10 +23,10 @@
2323 # Download TOMOYO Linux patches.
2424 mkdir -p ~/rpmbuild/SOURCES/
2525 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
26+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2727 then
2828 apt-get -y install wget
29- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
29+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3030 fi
3131
3232 # Install kernel source packages.
@@ -38,7 +38,7 @@
3838
3939 # Apply patches and create kernel config.
4040 cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ."
41-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
41+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4242 patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch."
4343 cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.ccs > .config || die "Can't create config."
4444 sed -i -e 's/SUBLEVEL = .*/SUBLEVEL = 0/' Makefile || die "Can't edit Makefile"
--- trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (revision 6842)
@@ -20,9 +20,9 @@
2020 rpm -ivh kernel-3.14.27-100.fc19.src.rpm || die "Can't install source package."
2121
2222 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
23+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2424 then
25- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
25+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2626 fi
2727
2828 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -35,7 +35,7 @@
3535 # (Uncomment the '#' and both spaces below to set the buildid.)
3636 #
3737 -# % define buildid .local
38-+%define buildid _tomoyo_1.8.7p2
38++%define buildid _tomoyo_1.8.8
3939 ###################################################################
4040
4141 # The buildid can also be specified on the rpmbuild command line
@@ -71,7 +71,7 @@
7171 # END OF PATCH APPLICATIONS
7272
7373 +# TOMOYO Linux
74-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
74++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
7575 +patch -sp1 < patches/ccs-patch-3.14-fedora-19.diff
7676 +
7777 %endif
--- trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6842)
@@ -20,9 +20,9 @@
2020 rpm -ivh kernel-3.19.8-100.fc20.src.rpm || die "Can't install source package."
2121
2222 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
23+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2424 then
25- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
25+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2626 fi
2727
2828 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -35,7 +35,7 @@
3535 # (Uncomment the '#' and both spaces below to set the buildid.)
3636 #
3737 -# % define buildid .local
38-+%define buildid _tomoyo_1.8.7p2
38++%define buildid _tomoyo_1.8.8
3939 ###################################################################
4040
4141 # The buildid can also be specified on the rpmbuild command line
@@ -71,7 +71,7 @@
7171 # END OF PATCH APPLICATIONS
7272
7373 +# TOMOYO Linux
74-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
74++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
7575 +patch -sp1 < patches/ccs-patch-3.19-fedora-20.diff
7676 +
7777 %endif
--- trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6842)
@@ -75,9 +75,9 @@
7575 rpm -ivh kernel-default-3.7.10-1.45.1.nosrc.rpm || die "Can't install source package."
7676
7777 cd /usr/src/packages/SOURCES/ || die "Can't chdir to /usr/src/packages/SOURCES/ ."
78-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
78+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
7979 then
80- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
80+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
8181 fi
8282
8383 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -96,7 +96,7 @@
9696 Group: System/Kernel
9797 Version: 3.7.10
9898 -Release: 1.45.1
99-+Release: 1.45.1_tomoyo_1.8.7p2
99++Release: 1.45.1_tomoyo_1.8.8
100100 %if 0%{?is_kotd}
101101 %else
102102 %endif
@@ -105,7 +105,7 @@
105105 %_sourcedir/series.conf .. $SYMBOLS
106106
107107 +# TOMOYO Linux
108-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
108++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
109109 +patch -sp1 < patches/ccs-patch-3.7-suse-12.3.diff
110110 +cat config.ccs >> ../config/%cpu_arch_flavor
111111 +
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-2.6.32/ || die "Can't chdir to linux-2.6.32/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-2.6.32-ubuntu-10.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.5.0/ || die "Can't chdir to linux-3.5.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.5-ubuntu-12.10.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.8.0/ || die "Can't chdir to linux-3.8.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.8-ubuntu-13.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.11.0/ || die "Can't chdir to linux-3.11.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.11-ubuntu-13.10.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (revision 6842)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
32+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done
--- trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (revision 6841)
+++ trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (revision 6842)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-4.4.110-2vl6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpm/SOURCES/ || die "Can't chdir to ~/rpm/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
21+if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -33,7 +33,7 @@
3333 %define kversion 4.%{sublevel}
3434 %define rpmversion 4.%{sublevel}.%{patchlevel}
3535 -%define release 2%{?_dist_release}
36-+%define release 2%{?_dist_release}_tomoyo_1.8.7p2
36++%define release 2%{?_dist_release}_tomoyo_1.8.8
3737
3838 %define make_target bzImage
3939 %define hdrarch %_target_cpu
@@ -61,7 +61,7 @@
6161 # END OF PATCH APPLICATIONS
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz
6565 +patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
6666 +
6767 cp %{SOURCE10} Documentation/
Show on old repository browser