OSDN > ソフトウェアを探す > システム > オペレーティングシステムカーネル > Linux > TOMOYO > SCM > SVN > コミット

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: コミット

コミットメタ情報

リビジョン	6857 (tree)
日時	2021-02-22 23:01:06
作者	kumaneko

ログメッセージ

(メッセージはありません)

変更サマリ

modified: branches/build-c53-2.6.18.sh (diff)
modified: branches/build-f13-2.6.33.sh (diff)
modified: tags/htdocs/1.8/android-arm.html.en (diff)
modified: tags/htdocs/1.8/android-arm.html.ja (diff)
modified: tags/htdocs/1.8/cat760-sh.html.en (diff)
modified: tags/htdocs/1.8/cat760-sh.html.ja (diff)
modified: tags/htdocs/1.8/chapter-3.html.en (diff)
modified: tags/htdocs/1.8/chapter-3.html.ja (diff)
modified: tags/htdocs/1.8/meego-x86.html.en (diff)
modified: tags/htdocs/1.8/meego-x86.html.ja (diff)
modified: tags/htdocs/1.8-old/android-arm.html.en (diff)
modified: tags/htdocs/1.8-old/android-arm.html.ja (diff)
modified: tags/htdocs/1.8-old/cat760-sh.html.en (diff)
modified: tags/htdocs/1.8-old/cat760-sh.html.ja (diff)
modified: tags/htdocs/1.8-old/install.html.en (diff)
modified: tags/htdocs/1.8-old/install.html.ja (diff)
modified: tags/htdocs/1.8-old/meego-x86.html.en (diff)
modified: tags/htdocs/1.8-old/meego-x86.html.ja (diff)
modified: tags/htdocs/1.8-old/phase-1.html.en (diff)
modified: tags/htdocs/1.8-old/phase-1.html.ja (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.11.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (diff)

差分

--- branches/build-c53-2.6.18.sh (revision 6856)

+++ branches/build-c53-2.6.18.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.18-128.7.1.el5.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd /usr/src/redhat/SOURCES/ \|\| die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	if [ ! -r ccs-patch-2.6.18-centos-5.3-20110614.diff ]

		@@ -66,7 +66,7 @@
66	66	# END OF PATCH APPLICATIONS
67	67
68	68	+# TOMOYO Linux
69		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	69	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
70	70	+patch -sp1 < %_sourcedir/ccs-patch-2.6.18-centos-5.3-20110614.diff
71	71	+
72	72	cp %{SOURCE10} Documentation/

--- branches/build-f13-2.6.33.sh (revision 6856)

+++ branches/build-f13-2.6.33.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.33.3-85.fc13.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	if [ ! -r ccs-patch-2.6.33-fedora-13-20110614.diff ]

		@@ -77,7 +77,7 @@
77	77	# END OF PATCH APPLICATIONS
78	78
79	79	+# TOMOYO Linux
80		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	80	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
81	81	+patch -sp1 < %_sourcedir/ccs-patch-2.6.33-fedora-13-20110614.diff
82	82	+
83	83	%endif

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6856)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6857)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.10.16.
	1	+This is TOMOYO Linux patch for kernel 5.10.17.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.16.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.17.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.10.16.orig/fs/exec.c
32		-+++ linux-5.10.16/fs/exec.c
	31	+--- linux-5.10.17.orig/fs/exec.c
	32	++++ linux-5.10.17/fs/exec.c
33	33	@@ -1817,7 +1817,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.10.16.orig/fs/open.c
43		-+++ linux-5.10.16/fs/open.c
	42	+--- linux-5.10.17.orig/fs/open.c
	43	++++ linux-5.10.17/fs/open.c
44	44	@@ -1331,6 +1331,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-5.10.16.orig/fs/proc/version.c
54		-+++ linux-5.10.16/fs/proc/version.c
	53	+--- linux-5.10.17.orig/fs/proc/version.c
	54	++++ linux-5.10.17/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.10.16 2021/02/14\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.17 2021/02/22\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.16.orig/include/linux/sched.h
67		-+++ linux-5.10.16/include/linux/sched.h
	66	+--- linux-5.10.17.orig/include/linux/sched.h
	67	++++ linux-5.10.17/include/linux/sched.h
68	68	@@ -41,6 +41,7 @@ struct backing_dev_info;
69	69	struct bio_list;
70	70	struct blk_plug;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.10.16.orig/include/linux/security.h
88		-+++ linux-5.10.16/include/linux/security.h
	87	+--- linux-5.10.17.orig/include/linux/security.h
	88	++++ linux-5.10.17/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.10.16.orig/include/net/ip.h
319		-+++ linux-5.10.16/include/net/ip.h
	318	+--- linux-5.10.17.orig/include/net/ip.h
	319	++++ linux-5.10.17/include/net/ip.h
320	320	@@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.10.16.orig/init/init_task.c
339		-+++ linux-5.10.16/init/init_task.c
	338	+--- linux-5.10.17.orig/init/init_task.c
	339	++++ linux-5.10.17/init/init_task.c
340	340	@@ -213,6 +213,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.10.16.orig/kernel/kexec.c
352		-+++ linux-5.10.16/kernel/kexec.c
	351	+--- linux-5.10.17.orig/kernel/kexec.c
	352	++++ linux-5.10.17/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.10.16.orig/kernel/module.c
372		-+++ linux-5.10.16/kernel/module.c
	371	+--- linux-5.10.17.orig/kernel/module.c
	372	++++ linux-5.10.17/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.10.16.orig/kernel/ptrace.c
400		-+++ linux-5.10.16/kernel/ptrace.c
	399	+--- linux-5.10.17.orig/kernel/ptrace.c
	400	++++ linux-5.10.17/kernel/ptrace.c
401	401	@@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.10.16.orig/kernel/reboot.c
426		-+++ linux-5.10.16/kernel/reboot.c
	425	+--- linux-5.10.17.orig/kernel/reboot.c
	426	++++ linux-5.10.17/kernel/reboot.c
427	427	@@ -17,6 +17,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,8 +441,8 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.10.16.orig/kernel/sched/core.c
445		-+++ linux-5.10.16/kernel/sched/core.c
	444	+--- linux-5.10.17.orig/kernel/sched/core.c
	445	++++ linux-5.10.17/kernel/sched/core.c
446	446	@@ -5035,6 +5035,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.10.16.orig/kernel/signal.c
456		-+++ linux-5.10.16/kernel/signal.c
	455	+--- linux-5.10.17.orig/kernel/signal.c
	456	++++ linux-5.10.17/kernel/signal.c
457	457	@@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.10.16.orig/kernel/sys.c
525		-+++ linux-5.10.16/kernel/sys.c
	524	+--- linux-5.10.17.orig/kernel/sys.c
	525	++++ linux-5.10.17/kernel/sys.c
526	526	@@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527	527
528	528	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.10.16.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.16/kernel/time/timekeeping.c
	555	+--- linux-5.10.17.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.17/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.10.16.orig/net/ipv4/raw.c
591		-+++ linux-5.10.16/net/ipv4/raw.c
	590	+--- linux-5.10.17.orig/net/ipv4/raw.c
	591	++++ linux-5.10.17/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.10.16.orig/net/ipv4/udp.c
604		-+++ linux-5.10.16/net/ipv4/udp.c
	603	+--- linux-5.10.17.orig/net/ipv4/udp.c
	604	++++ linux-5.10.17/net/ipv4/udp.c
605	605	@@ -1801,6 +1801,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.10.16.orig/net/ipv6/raw.c
615		-+++ linux-5.10.16/net/ipv6/raw.c
	614	+--- linux-5.10.17.orig/net/ipv6/raw.c
	615	++++ linux-5.10.17/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.10.16.orig/net/ipv6/udp.c
628		-+++ linux-5.10.16/net/ipv6/udp.c
	627	+--- linux-5.10.17.orig/net/ipv6/udp.c
	628	++++ linux-5.10.17/net/ipv6/udp.c
629	629	@@ -343,6 +343,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.10.16.orig/net/socket.c
639		-+++ linux-5.10.16/net/socket.c
	638	+--- linux-5.10.17.orig/net/socket.c
	639	++++ linux-5.10.17/net/socket.c
640	640	@@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.10.16.orig/net/unix/af_unix.c
652		-+++ linux-5.10.16/net/unix/af_unix.c
	651	+--- linux-5.10.17.orig/net/unix/af_unix.c
	652	++++ linux-5.10.17/net/unix/af_unix.c
653	653	@@ -2127,6 +2127,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.10.16.orig/security/Kconfig
673		-+++ linux-5.10.16/security/Kconfig
	672	+--- linux-5.10.17.orig/security/Kconfig
	673	++++ linux-5.10.17/security/Kconfig
674	674	@@ -291,5 +291,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.10.16.orig/security/Makefile
683		-+++ linux-5.10.16/security/Makefile
	682	+--- linux-5.10.17.orig/security/Makefile
	683	++++ linux-5.10.17/security/Makefile
684	684	@@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.10.16.orig/security/security.c
692		-+++ linux-5.10.16/security/security.c
	691	+--- linux-5.10.17.orig/security/security.c
	692	++++ linux-5.10.17/security/security.c
693	693	@@ -1585,7 +1585,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.11.diff (revision 6856)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.11.diff (revision 6857)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.11-rc7.
	1	+This is TOMOYO Linux patch for kernel 5.11.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.11-rc7.tar.gz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.11-rc7.orig/fs/exec.c
32		-+++ linux-5.11-rc7/fs/exec.c
	31	+--- linux-5.11.orig/fs/exec.c
	32	++++ linux-5.11/fs/exec.c
33	33	@@ -1823,7 +1823,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.11-rc7.orig/fs/open.c
43		-+++ linux-5.11-rc7/fs/open.c
	42	+--- linux-5.11.orig/fs/open.c
	43	++++ linux-5.11/fs/open.c
44	44	@@ -1331,6 +1331,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-5.11-rc7.orig/fs/proc/version.c
54		-+++ linux-5.11-rc7/fs/proc/version.c
	53	+--- linux-5.11.orig/fs/proc/version.c
	54	++++ linux-5.11/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.11-rc7 2021/02/14\n");
	62	++ printk(KERN_INFO "Hook version: 5.11 2021/02/15\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.11-rc7.orig/include/linux/sched.h
67		-+++ linux-5.11-rc7/include/linux/sched.h
	66	+--- linux-5.11.orig/include/linux/sched.h
	67	++++ linux-5.11/include/linux/sched.h
68	68	@@ -43,6 +43,7 @@ struct backing_dev_info;
69	69	struct bio_list;
70	70	struct blk_plug;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.11-rc7.orig/include/linux/security.h
88		-+++ linux-5.11-rc7/include/linux/security.h
	87	+--- linux-5.11.orig/include/linux/security.h
	88	++++ linux-5.11/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.11-rc7.orig/include/net/ip.h
319		-+++ linux-5.11-rc7/include/net/ip.h
	318	+--- linux-5.11.orig/include/net/ip.h
	319	++++ linux-5.11/include/net/ip.h
320	320	@@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.11-rc7.orig/init/init_task.c
339		-+++ linux-5.11-rc7/init/init_task.c
	338	+--- linux-5.11.orig/init/init_task.c
	339	++++ linux-5.11/init/init_task.c
340	340	@@ -213,6 +213,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.11-rc7.orig/kernel/kexec.c
352		-+++ linux-5.11-rc7/kernel/kexec.c
	351	+--- linux-5.11.orig/kernel/kexec.c
	352	++++ linux-5.11/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.11-rc7.orig/kernel/module.c
372		-+++ linux-5.11-rc7/kernel/module.c
	371	+--- linux-5.11.orig/kernel/module.c
	372	++++ linux-5.11/kernel/module.c
373	373	@@ -58,6 +58,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.11-rc7.orig/kernel/ptrace.c
400		-+++ linux-5.11-rc7/kernel/ptrace.c
	399	+--- linux-5.11.orig/kernel/ptrace.c
	400	++++ linux-5.11/kernel/ptrace.c
401	401	@@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.11-rc7.orig/kernel/reboot.c
426		-+++ linux-5.11-rc7/kernel/reboot.c
	425	+--- linux-5.11.orig/kernel/reboot.c
	426	++++ linux-5.11/kernel/reboot.c
427	427	@@ -17,6 +17,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,8 +441,8 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.11-rc7.orig/kernel/sched/core.c
445		-+++ linux-5.11-rc7/kernel/sched/core.c
	444	+--- linux-5.11.orig/kernel/sched/core.c
	445	++++ linux-5.11/kernel/sched/core.c
446	446	@@ -5588,6 +5588,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.11-rc7.orig/kernel/signal.c
456		-+++ linux-5.11-rc7/kernel/signal.c
	455	+--- linux-5.11.orig/kernel/signal.c
	456	++++ linux-5.11/kernel/signal.c
457	457	@@ -3677,6 +3677,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.11-rc7.orig/kernel/sys.c
525		-+++ linux-5.11-rc7/kernel/sys.c
	524	+--- linux-5.11.orig/kernel/sys.c
	525	++++ linux-5.11/kernel/sys.c
526	526	@@ -206,6 +206,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527	527
528	528	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.11-rc7.orig/kernel/time/timekeeping.c
556		-+++ linux-5.11-rc7/kernel/time/timekeeping.c
	555	+--- linux-5.11.orig/kernel/time/timekeeping.c
	556	++++ linux-5.11/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.11-rc7.orig/net/ipv4/raw.c
591		-+++ linux-5.11-rc7/net/ipv4/raw.c
	590	+--- linux-5.11.orig/net/ipv4/raw.c
	591	++++ linux-5.11/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.11-rc7.orig/net/ipv4/udp.c
604		-+++ linux-5.11-rc7/net/ipv4/udp.c
	603	+--- linux-5.11.orig/net/ipv4/udp.c
	604	++++ linux-5.11/net/ipv4/udp.c
605	605	@@ -1800,6 +1800,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.11-rc7.orig/net/ipv6/raw.c
615		-+++ linux-5.11-rc7/net/ipv6/raw.c
	614	+--- linux-5.11.orig/net/ipv6/raw.c
	615	++++ linux-5.11/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.11-rc7.orig/net/ipv6/udp.c
628		-+++ linux-5.11-rc7/net/ipv6/udp.c
	627	+--- linux-5.11.orig/net/ipv6/udp.c
	628	++++ linux-5.11/net/ipv6/udp.c
629	629	@@ -342,6 +342,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.11-rc7.orig/net/socket.c
639		-+++ linux-5.11-rc7/net/socket.c
	638	+--- linux-5.11.orig/net/socket.c
	639	++++ linux-5.11/net/socket.c
640	640	@@ -1736,6 +1736,10 @@ int __sys_accept4_file(struct file *file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.11-rc7.orig/net/unix/af_unix.c
652		-+++ linux-5.11-rc7/net/unix/af_unix.c
	651	+--- linux-5.11.orig/net/unix/af_unix.c
	652	++++ linux-5.11/net/unix/af_unix.c
653	653	@@ -2127,6 +2127,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.11-rc7.orig/security/Kconfig
673		-+++ linux-5.11-rc7/security/Kconfig
	672	+--- linux-5.11.orig/security/Kconfig
	673	++++ linux-5.11/security/Kconfig
674	674	@@ -291,5 +291,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.11-rc7.orig/security/Makefile
683		-+++ linux-5.11-rc7/security/Makefile
	682	+--- linux-5.11.orig/security/Makefile
	683	++++ linux-5.11/security/Makefile
684	684	@@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.11-rc7.orig/security/security.c
692		-+++ linux-5.11-rc7/security/security.c
	691	+--- linux-5.11.orig/security/security.c
	692	++++ linux-5.11/security/security.c
693	693	@@ -1586,7 +1586,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6856)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6857)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.4.98.
	1	+This is TOMOYO Linux patch for kernel 5.4.99.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.98.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.99.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.4.98.orig/fs/exec.c
32		-+++ linux-5.4.98/fs/exec.c
	31	+--- linux-5.4.99.orig/fs/exec.c
	32	++++ linux-5.4.99/fs/exec.c
33	33	@@ -1730,7 +1730,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-5.4.98.orig/fs/open.c
43		-+++ linux-5.4.98/fs/open.c
	42	+--- linux-5.4.99.orig/fs/open.c
	43	++++ linux-5.4.99/fs/open.c
44	44	@@ -1205,6 +1205,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-5.4.98.orig/fs/proc/version.c
54		-+++ linux-5.4.98/fs/proc/version.c
	53	+--- linux-5.4.99.orig/fs/proc/version.c
	54	++++ linux-5.4.99/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.4.98 2021/02/14\n");
	62	++ printk(KERN_INFO "Hook version: 5.4.99 2021/02/22\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.4.98.orig/include/linux/sched.h
67		-+++ linux-5.4.98/include/linux/sched.h
	66	+--- linux-5.4.99.orig/include/linux/sched.h
	67	++++ linux-5.4.99/include/linux/sched.h
68	68	@@ -38,6 +38,7 @@ struct backing_dev_info;
69	69	struct bio_list;
70	70	struct blk_plug;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.4.98.orig/include/linux/security.h
88		-+++ linux-5.4.98/include/linux/security.h
	87	+--- linux-5.4.99.orig/include/linux/security.h
	88	++++ linux-5.4.99/include/linux/security.h
89	89	@@ -57,6 +57,7 @@ struct mm_struct;
90	90	struct fs_context;
91	91	struct fs_parameter;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.4.98.orig/include/net/ip.h
319		-+++ linux-5.4.98/include/net/ip.h
	318	+--- linux-5.4.99.orig/include/net/ip.h
	319	++++ linux-5.4.99/include/net/ip.h
320	320	@@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -335,8 +335,8 @@
335	335	return 0;
336	336	}
337	337
338		---- linux-5.4.98.orig/init/init_task.c
339		-+++ linux-5.4.98/init/init_task.c
	338	+--- linux-5.4.99.orig/init/init_task.c
	339	++++ linux-5.4.99/init/init_task.c
340	340	@@ -183,6 +183,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECURITY
342	342	.security = NULL,

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.4.98.orig/kernel/kexec.c
352		-+++ linux-5.4.98/kernel/kexec.c
	351	+--- linux-5.4.99.orig/kernel/kexec.c
	352	++++ linux-5.4.99/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371		---- linux-5.4.98.orig/kernel/module.c
372		-+++ linux-5.4.98/kernel/module.c
	371	+--- linux-5.4.99.orig/kernel/module.c
	372	++++ linux-5.4.99/kernel/module.c
373	373	@@ -55,6 +55,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.4.98.orig/kernel/ptrace.c
400		-+++ linux-5.4.98/kernel/ptrace.c
	399	+--- linux-5.4.99.orig/kernel/ptrace.c
	400	++++ linux-5.4.99/kernel/ptrace.c
401	401	@@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.4.98.orig/kernel/reboot.c
426		-+++ linux-5.4.98/kernel/reboot.c
	425	+--- linux-5.4.99.orig/kernel/reboot.c
	426	++++ linux-5.4.99/kernel/reboot.c
427	427	@@ -17,6 +17,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,8 +441,8 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.4.98.orig/kernel/sched/core.c
445		-+++ linux-5.4.98/kernel/sched/core.c
	444	+--- linux-5.4.99.orig/kernel/sched/core.c
	445	++++ linux-5.4.99/kernel/sched/core.c
446	446	@@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.4.98.orig/kernel/signal.c
456		-+++ linux-5.4.98/kernel/signal.c
	455	+--- linux-5.4.99.orig/kernel/signal.c
	456	++++ linux-5.4.99/kernel/signal.c
457	457	@@ -3644,6 +3644,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.4.98.orig/kernel/sys.c
525		-+++ linux-5.4.98/kernel/sys.c
	524	+--- linux-5.4.99.orig/kernel/sys.c
	525	++++ linux-5.4.99/kernel/sys.c
526	526	@@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527	527
528	528	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.4.98.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.98/kernel/time/timekeeping.c
	555	+--- linux-5.4.99.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.99/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.4.98.orig/net/ipv4/raw.c
591		-+++ linux-5.4.98/net/ipv4/raw.c
	590	+--- linux-5.4.99.orig/net/ipv4/raw.c
	591	++++ linux-5.4.99/net/ipv4/raw.c
592	592	@@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.4.98.orig/net/ipv4/udp.c
604		-+++ linux-5.4.98/net/ipv4/udp.c
	603	+--- linux-5.4.99.orig/net/ipv4/udp.c
	604	++++ linux-5.4.99/net/ipv4/udp.c
605	605	@@ -1744,6 +1744,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.4.98.orig/net/ipv6/raw.c
615		-+++ linux-5.4.98/net/ipv6/raw.c
	614	+--- linux-5.4.99.orig/net/ipv6/raw.c
	615	++++ linux-5.4.99/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.4.98.orig/net/ipv6/udp.c
628		-+++ linux-5.4.98/net/ipv6/udp.c
	627	+--- linux-5.4.99.orig/net/ipv6/udp.c
	628	++++ linux-5.4.99/net/ipv6/udp.c
629	629	@@ -291,6 +291,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.4.98.orig/net/socket.c
639		-+++ linux-5.4.98/net/socket.c
	638	+--- linux-5.4.99.orig/net/socket.c
	639	++++ linux-5.4.99/net/socket.c
640	640	@@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.4.98.orig/net/unix/af_unix.c
652		-+++ linux-5.4.98/net/unix/af_unix.c
	651	+--- linux-5.4.99.orig/net/unix/af_unix.c
	652	++++ linux-5.4.99/net/unix/af_unix.c
653	653	@@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.4.98.orig/security/Kconfig
673		-+++ linux-5.4.98/security/Kconfig
	672	+--- linux-5.4.99.orig/security/Kconfig
	673	++++ linux-5.4.99/security/Kconfig
674	674	@@ -291,5 +291,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.4.98.orig/security/Makefile
683		-+++ linux-5.4.98/security/Makefile
	682	+--- linux-5.4.99.orig/security/Makefile
	683	++++ linux-5.4.99/security/Makefile
684	684	@@ -34,3 +34,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.4.98.orig/security/security.c
692		-+++ linux-5.4.98/security/security.c
	691	+--- linux-5.4.99.orig/security/security.c
	692	++++ linux-5.4.99/security/security.c
693	693	@@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.18-398.1.AXS3.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd /usr/src/asianux/SOURCES/ \|\| die "Can't chdir to /usr/src/asianux/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -61,7 +61,7 @@
61	61	# end of Asianux patches
62	62
63	63	+# TOMOYO Linux
64		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	64	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
65	65	+patch -sp1 < patches/ccs-patch-2.6.18-asianux-3.diff
66	66	+
67	67	cp %{SOURCE10} Documentation/

--- trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.4.21-63.EL.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd /usr/src/redhat/SOURCES/ \|\| die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -51,7 +51,7 @@
51	51	# END OF PATCH APPLICATIONS
52	52
53	53	+# TOMOYO Linux
54		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	54	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
55	55	+patch -sp1 < patches/ccs-patch-2.4.21-centos-3.diff
56	56	+
57	57	cp %{SOURCE10} Documentation/

--- trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.9-103.EL.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd /usr/src/redhat/SOURCES/ \|\| die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -61,7 +61,7 @@
61	61	# END OF PATCH APPLICATIONS
62	62
63	63	+# TOMOYO Linux
64		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	64	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
65	65	+patch -sp1 < patches/ccs-patch-2.6.9-centos-4.diff
66	66	+
67	67	cp %{SOURCE10} Documentation/

--- trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.18-419.el5.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd /usr/src/redhat/SOURCES/ \|\| die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -61,7 +61,7 @@
61	61	%endif
62	62
63	63	+# TOMOYO Linux
64		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	64	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
65	65	+patch -sp1 < patches/ccs-patch-2.6.18-centos-5.diff
66	66	+
67	67	cp %{SOURCE10} Documentation/

--- trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.32-754.35.1.el6.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -69,7 +69,7 @@
69	69	ApplyOptionalPatch linux-kernel-test.patch
70	70
71	71	+# TOMOYO Linux
72		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	72	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
73	73	+patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
74	74	+
75	75	# Any further pre-build tree manipulations happen here.

--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-3.10.0-1160.15.2.el7.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -69,7 +69,7 @@
69	69	ApplyOptionalPatch debrand-rh-i686-cpu.patch
70	70
71	71	+# TOMOYO Linux
72		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	72	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
73	73	+patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
74	74	+
75	75	# Any further pre-build tree manipulations happen here.

--- trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-4.18.0-240.10.1.el8_3.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -42,7 +42,7 @@
42	42	# END OF PATCH APPLICATIONS
43	43
44	44	+# TOMOYO Linux
45		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	45	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
46	46	+patch -sp1 < patches/ccs-patch-4.18-centos-8.diff
47	47	+
48	48	# Any further pre-build tree manipulations happen here.

--- trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6857)

		@@ -38,9 +38,9 @@
38	38	# Download TOMOYO Linux patches.
39	39	mkdir -p ~/rpmbuild/SOURCES/
40	40	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
41		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	41	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
42	42	then
43		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	43	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
44	44	fi
45	45
46	46	# Install kernel source packages.

		@@ -52,7 +52,7 @@
52	52
53	53	# Apply patches and create kernel config.
54	54	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.8-20201215.tar.gz \|\| die "Can't extract patch."
	55	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
56	56	patch -p1 < patches/ccs-patch-2.6.32-debian-squeeze.diff \|\| die "Can't apply patch."
57	57	cat /boot/config-2.6.32-5-686 config.ccs > .config \|\| die "Can't create config."
58	58

--- trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6857)

		@@ -23,10 +23,10 @@
23	23	# Download TOMOYO Linux patches.
24	24	mkdir -p ~/rpmbuild/SOURCES/
25	25	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	26	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
27	27	then
28	28	apt-get -y install wget
29		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	29	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
30	30	fi
31	31
32	32	# Install kernel source packages.

		@@ -38,7 +38,7 @@
38	38
39	39	# Apply patches and create kernel config.
40	40	cd linux-source-3.2 \|\| die "Can't chdir to linux-source-3.2/ ."
41		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	41	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
42	42	patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff \|\| die "Can't apply patch."
43	43	cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.ccs > .config \|\| die "Can't create config."
44	44	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (revision 6857)

		@@ -20,9 +20,9 @@
20	20	rpm -ivh kernel-3.14.27-100.fc19.src.rpm \|\| die "Can't install source package."
21	21
22	22	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	23	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
24	24	then
25		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	25	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
26	26	fi
27	27
28	28	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -71,7 +71,7 @@
71	71	# END OF PATCH APPLICATIONS
72	72
73	73	+# TOMOYO Linux
74		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	74	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
75	75	+patch -sp1 < patches/ccs-patch-3.14-fedora-19.diff
76	76	+
77	77	%endif

--- trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6857)

		@@ -20,9 +20,9 @@
20	20	rpm -ivh kernel-3.19.8-100.fc20.src.rpm \|\| die "Can't install source package."
21	21
22	22	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	23	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
24	24	then
25		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	25	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
26	26	fi
27	27
28	28	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -71,7 +71,7 @@
71	71	# END OF PATCH APPLICATIONS
72	72
73	73	+# TOMOYO Linux
74		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	74	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
75	75	+patch -sp1 < patches/ccs-patch-3.19-fedora-20.diff
76	76	+
77	77	%endif

--- trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6857)

		@@ -75,9 +75,9 @@
75	75	rpm -ivh kernel-default-3.7.10-1.45.1.nosrc.rpm \|\| die "Can't install source package."
76	76
77	77	cd /usr/src/packages/SOURCES/ \|\| die "Can't chdir to /usr/src/packages/SOURCES/ ."
78		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	78	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
79	79	then
80		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	80	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
81	81	fi
82	82
83	83	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -105,7 +105,7 @@
105	105	%_sourcedir/series.conf .. $SYMBOLS
106	106
107	107	+# TOMOYO Linux
108		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	108	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
109	109	+patch -sp1 < patches/ccs-patch-3.7-suse-12.3.diff
110	110	+cat config.ccs >> ../config/%cpu_arch_flavor
111	111	+

--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-2.6.32/ \|\| die "Can't chdir to linux-2.6.32/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-2.6.32-ubuntu-10.04.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.2.0/ \|\| die "Can't chdir to linux-3.2.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.5.0/ \|\| die "Can't chdir to linux-3.5.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-3.5-ubuntu-12.10.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.8.0/ \|\| die "Can't chdir to linux-3.8.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-3.8-ubuntu-13.04.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.11.0/ \|\| die "Can't chdir to linux-3.11.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-3.11-ubuntu-13.10.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (revision 6857)

		@@ -29,9 +29,9 @@
29	29	# Download TOMOYO Linux patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	32	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
33	33	then
34		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.13.0/ \|\| die "Can't chdir to linux-3.13.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201215.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20210222.tar.gz \|\| die "Can't extract patch."
48	48	patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff \|\| die "Can't apply patch."
49	49	rm -fR patches/ specs/ \|\| die "Can't delete patch."
50	50	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 6856)

+++ trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (revision 6857)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-4.4.110-2vl6.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpm/SOURCES/ \|\| die "Can't chdir to ~/rpm/SOURCES/ ."
21		-if [ ! -r ccs-patch-1.8.8-20201215.tar.gz ]
	21	+if [ ! -r ccs-patch-1.8.8-20210222.tar.gz ]
22	22	then
23		- wget -O ccs-patch-1.8.8-20201215.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201215.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O ccs-patch-1.8.8-20210222.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20210222.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -61,7 +61,7 @@
61	61	# END OF PATCH APPLICATIONS
62	62
63	63	+# TOMOYO Linux
64		-+tar -zxf %_sourcedir/ccs-patch-1.8.8-20201215.tar.gz
	64	++tar -zxf %_sourcedir/ccs-patch-1.8.8-20210222.tar.gz
65	65	+patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
66	66	+
67	67	cp %{SOURCE10} Documentation/

旧リポジトリブラウザで表示

TOMOYO Fork

tomoyo: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

TOMOYO
Fork