OSDN > Finden Software > System > Operating System Kernels > Linux > CaitSith > SCM > SVN > Commit

CaitSith

R/O
SSH
HTTPS

caitsith: Commit

Commit MetaInfo

Revision	370 (tree)
Zeit	2022-06-21 22:02:19
Autor	kumaneko

Log Message

(empty log message)

Ändern Zusammenfassung

modified: tags/htdocs/index.html (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.19.diff (diff)
modified: trunk/caitsith-patch/specs/build-c6-2.6.32.sh (diff)
modified: trunk/caitsith-patch/specs/build-c7-3.10.sh (diff)
modified: trunk/caitsith-patch/specs/build-c8-4.18.sh (diff)
modified: trunk/caitsith-patch/specs/build-debian_wheezy.sh (diff)
modified: trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (diff)
modified: trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (diff)
modified: trunk/caitsith-patch/specs/build-vl6-4.4.sh (diff)

Diff

--- tags/htdocs/index.html (revision 369)

+++ tags/htdocs/index.html (revision 370)

		@@ -304,12 +304,12 @@
304	304	<p>Run the following commands in order to extract source code of CaitSith:</p>
305	305
306	306	<pre class="command">
307		-# wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz'
308		-# wget -O caitsith-patch-0.2-20220512.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz.asc'
	307	+# wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220621.tar.gz'
	308	+# wget -O caitsith-patch-0.2-20220621.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220621.tar.gz.asc'
309	309	# wget https://tomoyo.osdn.jp/kumaneko-key
310	310	# gpg --import kumaneko-key
311		-# gpg caitsith-patch-0.2-20220512.tar.gz.asc
312		-# tar -zxf caitsith-patch-0.2-20220512.tar.gz
	311	+# gpg caitsith-patch-0.2-20220621.tar.gz.asc
	312	+# tar -zxf caitsith-patch-0.2-20220621.tar.gz
313	313	</pre>
314	314
315	315	<hr>

		@@ -645,12 +645,12 @@
645	645	Also, there are several patches which can be applied to distributor's latest kernels. For example "3.10-centos-7" if using CentOS 7's latest kernel:</p>
646	646
647	647	<pre class="command">
648		-$ wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz'
649		-$ wget -O caitsith-patch-0.2-20220512.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz.asc'
	648	+$ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220621.tar.gz'
	649	+$ wget -O caitsith-patch-0.2-20220621.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20220621.tar.gz.asc'
650	650	$ wget https://tomoyo.osdn.jp/kumaneko-key
651	651	$ gpg --import kumaneko-key
652		-$ gpg caitsith-patch-0.2-20220512.tar.gz.asc
653		-$ tar -zxf caitsith-patch-0.2-20220512.tar.gz
	652	+$ gpg caitsith-patch-0.2-20220621.tar.gz.asc
	653	+$ tar -zxf caitsith-patch-0.2-20220621.tar.gz
654	654	$ sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' -- patches/ccs-patch-*.diff
655	655	$ patch -sp1 < patches/ccs-patch-$VERSION.diff
656	656	</pre>

--- trunk/caitsith-patch/patches/ccs-patch-5.19.diff (revision 369)

+++ trunk/caitsith-patch/patches/ccs-patch-5.19.diff (revision 370)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.19-rc2.
	1	+This is TOMOYO Linux patch for kernel 5.19-rc3.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.19-rc2.tar.gz
	3	+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.19-rc3.tar.gz
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, 150 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.19-rc2.orig/fs/exec.c
32		-+++ linux-5.19-rc2/fs/exec.c
	31	+--- linux-5.19-rc3.orig/fs/exec.c
	32	++++ linux-5.19-rc3/fs/exec.c
33	33	@@ -1835,7 +1835,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.19-rc2.orig/fs/open.c
43		-+++ linux-5.19-rc2/fs/open.c
	42	+--- linux-5.19-rc3.orig/fs/open.c
	43	++++ linux-5.19-rc3/fs/open.c
44	44	@@ -1439,6 +1439,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.19-rc2.orig/fs/proc/version.c
54		-+++ linux-5.19-rc2/fs/proc/version.c
	53	+--- linux-5.19-rc3.orig/fs/proc/version.c
	54	++++ linux-5.19-rc3/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.19-rc2 2022/06/17\n");
	62	++ printk(KERN_INFO "Hook version: 5.19-rc3 2022/06/21\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.19-rc2.orig/include/linux/sched.h
67		-+++ linux-5.19-rc2/include/linux/sched.h
	66	+--- linux-5.19-rc3.orig/include/linux/sched.h
	67	++++ linux-5.19-rc3/include/linux/sched.h
68	68	@@ -44,6 +44,7 @@ struct blk_plug;
69	69	struct bpf_local_storage;
70	70	struct bpf_run_ctx;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_TRACING
86	86	/* State flags for use by tracers: */
87		---- linux-5.19-rc2.orig/include/linux/security.h
88		-+++ linux-5.19-rc2/include/linux/security.h
	87	+--- linux-5.19-rc3.orig/include/linux/security.h
	88	++++ linux-5.19-rc3/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -305,8 +305,8 @@
305	305	}
306	306	#endif /* CONFIG_SECURITY_PATH */
307	307
308		---- linux-5.19-rc2.orig/include/net/ip.h
309		-+++ linux-5.19-rc2/include/net/ip.h
	308	+--- linux-5.19-rc3.orig/include/net/ip.h
	309	++++ linux-5.19-rc3/include/net/ip.h
310	310	@@ -345,6 +345,8 @@ void inet_get_local_port_range(struct ne
311	311	#ifdef CONFIG_SYSCTL
312	312	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -325,8 +325,8 @@
325	325	return false;
326	326	}
327	327
328		---- linux-5.19-rc2.orig/init/init_task.c
329		-+++ linux-5.19-rc2/init/init_task.c
	328	+--- linux-5.19-rc3.orig/init/init_task.c
	329	++++ linux-5.19-rc3/init/init_task.c
330	330	@@ -209,6 +209,10 @@ struct task_struct init_task
331	331	#ifdef CONFIG_SECCOMP_FILTER
332	332	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -338,8 +338,8 @@
338	338	};
339	339	EXPORT_SYMBOL(init_task);
340	340
341		---- linux-5.19-rc2.orig/kernel/kexec.c
342		-+++ linux-5.19-rc2/kernel/kexec.c
	341	+--- linux-5.19-rc3.orig/kernel/kexec.c
	342	++++ linux-5.19-rc3/kernel/kexec.c
343	343	@@ -16,7 +16,7 @@
344	344	#include <linux/syscalls.h>
345	345	#include <linux/vmalloc.h>

		@@ -358,8 +358,8 @@
358	358
359	359	/* Permit LSMs and IMA to fail the kexec */
360	360	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
361		---- linux-5.19-rc2.orig/kernel/module/main.c
362		-+++ linux-5.19-rc2/kernel/module/main.c
	361	+--- linux-5.19-rc3.orig/kernel/module/main.c
	362	++++ linux-5.19-rc3/kernel/module/main.c
363	363	@@ -58,6 +58,7 @@
364	364
365	365	#define CREATE_TRACE_POINTS

		@@ -386,8 +386,8 @@
386	386
387	387	return 0;
388	388	}
389		---- linux-5.19-rc2.orig/kernel/ptrace.c
390		-+++ linux-5.19-rc2/kernel/ptrace.c
	389	+--- linux-5.19-rc3.orig/kernel/ptrace.c
	390	++++ linux-5.19-rc3/kernel/ptrace.c
391	391	@@ -1271,6 +1271,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
392	392	{
393	393	struct task_struct *child;

		@@ -412,8 +412,8 @@
412	412
413	413	if (request == PTRACE_TRACEME) {
414	414	ret = ptrace_traceme();
415		---- linux-5.19-rc2.orig/kernel/reboot.c
416		-+++ linux-5.19-rc2/kernel/reboot.c
	415	+--- linux-5.19-rc3.orig/kernel/reboot.c
	416	++++ linux-5.19-rc3/kernel/reboot.c
417	417	@@ -18,6 +18,7 @@
418	418	#include <linux/syscalls.h>
419	419	#include <linux/syscore_ops.h>

		@@ -422,7 +422,7 @@
422	422
423	423	/*
424	424	* this indicates whether you can reboot with ctrl-alt-del: the default is yes
425		-@@ -698,6 +699,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
	425	+@@ -700,6 +701,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
426	426	magic2 != LINUX_REBOOT_MAGIC2B &&
427	427	magic2 != LINUX_REBOOT_MAGIC2C))
428	428	return -EINVAL;

		@@ -431,9 +431,9 @@
431	431
432	432	/*
433	433	* If pid namespaces are enabled and the current task is in a child
434		---- linux-5.19-rc2.orig/kernel/sched/core.c
435		-+++ linux-5.19-rc2/kernel/sched/core.c
436		-@@ -6993,6 +6993,8 @@ int can_nice(const struct task_struct *p
	434	+--- linux-5.19-rc3.orig/kernel/sched/core.c
	435	++++ linux-5.19-rc3/kernel/sched/core.c
	436	+@@ -7023,6 +7023,8 @@ int can_nice(const struct task_struct *p
437	437	SYSCALL_DEFINE1(nice, int, increment)
438	438	{
439	439	long nice, retval;

		@@ -442,8 +442,8 @@
442	442
443	443	/*
444	444	* Setpriority might change our priority at the same moment.
445		---- linux-5.19-rc2.orig/kernel/signal.c
446		-+++ linux-5.19-rc2/kernel/signal.c
	445	+--- linux-5.19-rc3.orig/kernel/signal.c
	446	++++ linux-5.19-rc3/kernel/signal.c
447	447	@@ -3770,6 +3770,8 @@ static inline void prepare_kill_siginfo(
448	448	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
449	449	{

		@@ -511,8 +511,8 @@
511	511
512	512	return do_send_specific(tgid, pid, sig, info);
513	513	}
514		---- linux-5.19-rc2.orig/kernel/sys.c
515		-+++ linux-5.19-rc2/kernel/sys.c
	514	+--- linux-5.19-rc3.orig/kernel/sys.c
	515	++++ linux-5.19-rc3/kernel/sys.c
516	516	@@ -218,6 +218,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
517	517
518	518	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -542,8 +542,8 @@
542	542
543	543	errno = -EFAULT;
544	544	if (!copy_from_user(tmp, name, len)) {
545		---- linux-5.19-rc2.orig/kernel/time/timekeeping.c
546		-+++ linux-5.19-rc2/kernel/time/timekeeping.c
	545	+--- linux-5.19-rc3.orig/kernel/time/timekeeping.c
	546	++++ linux-5.19-rc3/kernel/time/timekeeping.c
547	547	@@ -23,6 +23,7 @@
548	548	#include <linux/pvclock_gtod.h>
549	549	#include <linux/compiler.h>

		@@ -577,8 +577,8 @@
577	577
578	578	/*
579	579	* Validate if a timespec/timeval used to inject a time
580		---- linux-5.19-rc2.orig/net/ipv4/raw.c
581		-+++ linux-5.19-rc2/net/ipv4/raw.c
	580	+--- linux-5.19-rc3.orig/net/ipv4/raw.c
	581	++++ linux-5.19-rc3/net/ipv4/raw.c
582	582	@@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk,
583	583	skb = skb_recv_datagram(sk, flags, &err);
584	584	if (!skb)

		@@ -590,8 +590,8 @@
590	590
591	591	copied = skb->len;
592	592	if (len < copied) {
593		---- linux-5.19-rc2.orig/net/ipv4/udp.c
594		-+++ linux-5.19-rc2/net/ipv4/udp.c
	593	+--- linux-5.19-rc3.orig/net/ipv4/udp.c
	594	++++ linux-5.19-rc3/net/ipv4/udp.c
595	595	@@ -1861,6 +1861,8 @@ try_again:
596	596	skb = __skb_recv_udp(sk, flags, &off, &err);
597	597	if (!skb)

		@@ -601,8 +601,8 @@
601	601
602	602	ulen = udp_skb_len(skb);
603	603	copied = len;
604		---- linux-5.19-rc2.orig/net/ipv6/raw.c
605		-+++ linux-5.19-rc2/net/ipv6/raw.c
	604	+--- linux-5.19-rc3.orig/net/ipv6/raw.c
	605	++++ linux-5.19-rc3/net/ipv6/raw.c
606	606	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
607	607	skb = skb_recv_datagram(sk, flags, &err);
608	608	if (!skb)

		@@ -614,8 +614,8 @@
614	614
615	615	copied = skb->len;
616	616	if (copied > len) {
617		---- linux-5.19-rc2.orig/net/ipv6/udp.c
618		-+++ linux-5.19-rc2/net/ipv6/udp.c
	617	+--- linux-5.19-rc3.orig/net/ipv6/udp.c
	618	++++ linux-5.19-rc3/net/ipv6/udp.c
619	619	@@ -346,6 +346,8 @@ try_again:
620	620	skb = __skb_recv_udp(sk, flags, &off, &err);
621	621	if (!skb)

		@@ -625,8 +625,8 @@
625	625
626	626	ulen = udp6_skb_len(skb);
627	627	copied = len;
628		---- linux-5.19-rc2.orig/net/socket.c
629		-+++ linux-5.19-rc2/net/socket.c
	628	+--- linux-5.19-rc3.orig/net/socket.c
	629	++++ linux-5.19-rc3/net/socket.c
630	630	@@ -1858,6 +1858,10 @@ struct file do_accept(struct file file
631	631	if (err < 0)
632	632	goto out_fd;

		@@ -638,8 +638,8 @@
638	638	if (upeer_sockaddr) {
639	639	len = newsock->ops->getname(newsock,
640	640	(struct sockaddr *)&address, 2);
641		---- linux-5.19-rc2.orig/net/unix/af_unix.c
642		-+++ linux-5.19-rc2/net/unix/af_unix.c
	641	+--- linux-5.19-rc3.orig/net/unix/af_unix.c
	642	++++ linux-5.19-rc3/net/unix/af_unix.c
643	643	@@ -2418,6 +2418,10 @@ int __unix_dgram_recvmsg(struct sock *sk
644	644	EPOLLOUT \| EPOLLWRNORM \|
645	645	EPOLLWRBAND);

		@@ -659,8 +659,8 @@
659	659	mutex_unlock(&u->iolock);
660	660	out:
661	661	return err;
662		---- linux-5.19-rc2.orig/security/Kconfig
663		-+++ linux-5.19-rc2/security/Kconfig
	662	+--- linux-5.19-rc3.orig/security/Kconfig
	663	++++ linux-5.19-rc3/security/Kconfig
664	664	@@ -271,5 +271,7 @@ config LSM
665	665
666	666	source "security/Kconfig.hardening"

		@@ -669,8 +669,8 @@
669	669	+
670	670	endmenu
671	671
672		---- linux-5.19-rc2.orig/security/Makefile
673		-+++ linux-5.19-rc2/security/Makefile
	672	+--- linux-5.19-rc3.orig/security/Makefile
	673	++++ linux-5.19-rc3/security/Makefile
674	674	@@ -27,3 +27,6 @@ obj-$(CONFIG_SECURITY_LANDLOCK) += land
675	675
676	676	# Object integrity file lists

		@@ -678,8 +678,8 @@
678	678	+
679	679	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
680	680	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
681		---- linux-5.19-rc2.orig/security/security.c
682		-+++ linux-5.19-rc2/security/security.c
	681	+--- linux-5.19-rc3.orig/security/security.c
	682	++++ linux-5.19-rc3/security/security.c
683	683	@@ -1655,7 +1655,9 @@ int security_task_alloc(struct task_stru
684	684
685	685	if (rc)

--- trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 370)

		@@ -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 caitsith-patch-0.2-20220512.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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	+# CaitSith
72		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20220512.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20220621.tar.gz
73	73	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
74	74	+patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
75	75	# Any further pre-build tree manipulations happen here.

--- trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 370)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-3.10.0-1160.66.1.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 caitsith-patch-0.2-20220512.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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	+# CaitSith
72		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20220512.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20220621.tar.gz
73	73	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
74	74	+patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
75	75	# Any further pre-build tree manipulations happen here.

--- trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 370)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-4.18.0-394.el8.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 caitsith-patch-0.2-20220512.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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	+# CaitSith
45		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20220512.tar.gz
	45	++tar -zxf %_sourcedir/caitsith-patch-0.2-20220621.tar.gz
46	46	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
47	47	+patch -sp1 < patches/ccs-patch-4.18-centos-8.diff
48	48	# Any further pre-build tree manipulations happen here.

--- trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 370)

		@@ -23,10 +23,10 @@
23	23	# Download CaitSith patches.
24	24	mkdir -p ~/rpmbuild/SOURCES/
25	25	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26		-if [ ! -r caitsith-patch-0.2-20220512.tar.gz ]
	26	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
27	27	then
28	28	apt-get -y install wget
29		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	29	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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/caitsith-patch-0.2-20220512.tar.gz \|\| die "Can't extract patch."
	41	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20220621.tar.gz \|\| die "Can't extract patch."
42	42	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
43	43	patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff \|\| die "Can't apply patch."
44	44	cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.caitsith > .config \|\| die "Can't create config."

--- trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 370)

		@@ -29,9 +29,9 @@
29	29	# Download CaitSith patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r caitsith-patch-0.2-20220512.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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/caitsith-patch-0.2-20220512.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20220621.tar.gz \|\| die "Can't extract patch."
48	48	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
49	49	patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff \|\| die "Can't apply patch."
50	50	rm -fR patches/ specs/ \|\| die "Can't delete patch."

--- trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 370)

		@@ -29,9 +29,9 @@
29	29	# Download CaitSith patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r caitsith-patch-0.2-20220512.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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/caitsith-patch-0.2-20220512.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20220621.tar.gz \|\| die "Can't extract patch."
48	48	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
49	49	patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff \|\| die "Can't apply patch."
50	50	rm -fR patches/ specs/ \|\| die "Can't delete patch."

--- trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 369)

+++ trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 370)

		@@ -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 caitsith-patch-0.2-20220512.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20220621.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20220512.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220512.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20220621.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20220621.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	+# CaitSith
64		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20220512.tar.gz
	64	++tar -zxf %_sourcedir/caitsith-patch-0.2-20220621.tar.gz
65	65	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
66	66	+patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
67	67	cp %{SOURCE10} Documentation/

Show on old repository browser