1 |
jlec 12/08/30 06:42:46 |
2 |
|
3 |
Modified: metadata.xml ChangeLog fcron-3.0.6-r3.ebuild |
4 |
Log: |
5 |
sys-process/fcron: User src_prepare instead of src_unpack; indent input redirections; don't use ewarn for blank lines; use defualt src_ompile(); fix potential buffer overflow |
6 |
|
7 |
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 sys-process/fcron/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/metadata.xml?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-process/fcron/metadata.xml,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- metadata.xml 29 Aug 2012 17:38:40 -0000 1.7 |
23 |
+++ metadata.xml 30 Aug 2012 06:42:46 -0000 1.8 |
24 |
@@ -1,34 +1,32 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
- <herd>cron</herd> |
29 |
- <maintainer> |
30 |
- <email>wschlich@g.o</email> |
31 |
- <name>Wolfram Schlich</name> |
32 |
- <description>Primary maintainer</description> |
33 |
- </maintainer> |
34 |
- <maintainer> |
35 |
- <email>flameeyes@g.o</email> |
36 |
- </maintainer> |
37 |
- <use> |
38 |
- <flag name="debug"> |
39 |
+ <herd>cron</herd> |
40 |
+ <maintainer> |
41 |
+ <email>wschlich@g.o</email> |
42 |
+ <name>Wolfram Schlich</name> |
43 |
+ <description>Primary maintainer</description> |
44 |
+ </maintainer> |
45 |
+ <maintainer> |
46 |
+ <email>flameeyes@g.o</email> |
47 |
+ </maintainer> |
48 |
+ <use> |
49 |
+ <flag name="debug"> |
50 |
Enable debug code and output. Since version 3.0.5 this will no |
51 |
longer force foreground execution, and fcron will be able to run |
52 |
as a service properly. |
53 |
</flag> |
54 |
- |
55 |
- <flag name="pam"> |
56 |
+ <flag name="pam"> |
57 |
Enable PAM support for fcron. This means that fcron will pass |
58 |
through the "fcron" stack before executing the jobs, and |
59 |
fcrontab will use the "fcrontab" stack to authenticate the user |
60 |
before editing its crontab file. |
61 |
</flag> |
62 |
- |
63 |
- <flag name="system-crontab"> |
64 |
+ <flag name="system-crontab"> |
65 |
Set up fcron to respect /etc/crontab and /etc/cron.d. If this |
66 |
flag is disabled, /etc/cron.d and /etc/crontab will be ignored, |
67 |
but /etc/cron.{hourly,daily,weekly,monthly} will still be |
68 |
respected. |
69 |
</flag> |
70 |
- </use> |
71 |
+ </use> |
72 |
</pkgmetadata> |
73 |
|
74 |
|
75 |
|
76 |
1.95 sys-process/fcron/ChangeLog |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?rev=1.95&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?rev=1.95&content-type=text/plain |
80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/ChangeLog?r1=1.94&r2=1.95 |
81 |
|
82 |
Index: ChangeLog |
83 |
=================================================================== |
84 |
RCS file: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v |
85 |
retrieving revision 1.94 |
86 |
retrieving revision 1.95 |
87 |
diff -u -r1.94 -r1.95 |
88 |
--- ChangeLog 29 Aug 2012 17:48:36 -0000 1.94 |
89 |
+++ ChangeLog 30 Aug 2012 06:42:46 -0000 1.95 |
90 |
@@ -1,6 +1,12 @@ |
91 |
# ChangeLog for sys-process/fcron |
92 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
93 |
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.94 2012/08/29 17:48:36 flameeyes Exp $ |
94 |
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.95 2012/08/30 06:42:46 jlec Exp $ |
95 |
+ |
96 |
+ 30 Aug 2012; Justin Lecher <jlec@g.o> fcron-3.0.6-r3.ebuild, |
97 |
+ +files/fcron-3.0.6-buffer-overflow.patch, metadata.xml: |
98 |
+ User src_prepare instead of src_unpack; indent input redirections; don't use |
99 |
+ ewarn for blank lines; use defualt src_ompile(); fix potential buffer |
100 |
+ overflow |
101 |
|
102 |
29 Aug 2012; Diego E. Pettenò <flameeyes@g.o> fcron-3.0.6-r3.ebuild: |
103 |
Fix comment in pam.d file. |
104 |
|
105 |
|
106 |
|
107 |
1.3 sys-process/fcron/fcron-3.0.6-r3.ebuild |
108 |
|
109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild?rev=1.3&view=markup |
110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild?rev=1.3&content-type=text/plain |
111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild?r1=1.2&r2=1.3 |
112 |
|
113 |
Index: fcron-3.0.6-r3.ebuild |
114 |
=================================================================== |
115 |
RCS file: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v |
116 |
retrieving revision 1.2 |
117 |
retrieving revision 1.3 |
118 |
diff -u -r1.2 -r1.3 |
119 |
--- fcron-3.0.6-r3.ebuild 29 Aug 2012 17:48:36 -0000 1.2 |
120 |
+++ fcron-3.0.6-r3.ebuild 30 Aug 2012 06:42:46 -0000 1.3 |
121 |
@@ -1,6 +1,6 @@ |
122 |
# Copyright 1999-2012 Gentoo Foundation |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v 1.2 2012/08/29 17:48:36 flameeyes Exp $ |
125 |
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r3.ebuild,v 1.3 2012/08/30 06:42:46 jlec Exp $ |
126 |
|
127 |
EAPI=4 |
128 |
|
129 |
@@ -35,9 +35,8 @@ |
130 |
[[ ${rootgroup} ]] || rootgroup=root |
131 |
} |
132 |
|
133 |
-src_unpack() { |
134 |
- unpack ${A} |
135 |
- cd "${S}" |
136 |
+src_prepare() { |
137 |
+ epatch "${FILESDIR}"/${P}-buffer-overflow.patch |
138 |
|
139 |
# respect LDFLAGS |
140 |
sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed" |
141 |
@@ -76,7 +75,7 @@ |
142 |
} |
143 |
|
144 |
src_compile() { |
145 |
- emake || die "make failed" |
146 |
+ default |
147 |
|
148 |
# bug #216460 |
149 |
sed -i \ |
150 |
@@ -135,17 +134,17 @@ |
151 |
fperms 0640 /etc/fcron/fcron.{allow,deny,conf} |
152 |
|
153 |
pamd_mimic system-services fcron auth account session |
154 |
- cat - > "${T}"/fcrontab.pam <<EOF |
155 |
-# Don't ask for the user's password; fcrontab will only allow to |
156 |
-# change user if running as root. |
157 |
-auth sufficient pam_permit.so |
158 |
- |
159 |
-# Still use the system-auth stack for account and session as the |
160 |
-# sysadmin might have set up stuff properly, and also avoids |
161 |
-# sidestepping limits (since fcrontab will run \$EDITOR). |
162 |
-account include system-auth |
163 |
-session include system-auth |
164 |
-EOF |
165 |
+ cat > "${T}"/fcrontab.pam <<- EOF |
166 |
+ # Don't ask for the user's password; fcrontab will only allow to |
167 |
+ # change user if running as root. |
168 |
+ auth sufficient pam_permit.so |
169 |
+ |
170 |
+ # Still use the system-auth stack for account and session as the |
171 |
+ # sysadmin might have set up stuff properly, and also avoids |
172 |
+ # sidestepping limits (since fcrontab will run \$EDITOR). |
173 |
+ account include system-auth |
174 |
+ session include system-auth |
175 |
+ EOF |
176 |
newpamd "${T}"/fcrontab.pam fcrontab |
177 |
|
178 |
newinitd "${FILESDIR}"/fcron.init.3 fcron |
179 |
@@ -170,9 +169,9 @@ |
180 |
elog " emerge --config ${CATEGORY}/${PN}" |
181 |
elog "to configure the proper settings." |
182 |
if ! use system-crontab; then |
183 |
- ewarn "" |
184 |
+ echo "" |
185 |
ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration" |
186 |
- ewarn "" |
187 |
+ echo "" |
188 |
fi |
189 |
} |
190 |
|
191 |
@@ -192,11 +191,11 @@ |
192 |
else |
193 |
elog "This is going to set up fcron to set up a default systab that" |
194 |
elog "executes /etc/cron.{hourly,daily,weekly,monthly}." |
195 |
- fcrontab -u systab - <<EOF |
196 |
-0 * * * * rm -f /var/spool/cron/lastrun/cron.hourly |
197 |
-1 3 * * * rm -f /var/spool/cron/lastrun/cron.daily |
198 |
-15 4 * * 6 rm -f /var/spool/cron/lastrun/cron.weekly |
199 |
-30 5 1 * * rm -f /var/spool/cron/lastrun/cron.monthly |
200 |
-EOF |
201 |
+ fcrontab -u systab - <<- EOF |
202 |
+ 0 * * * * rm -f /var/spool/cron/lastrun/cron.hourly |
203 |
+ 1 3 * * * rm -f /var/spool/cron/lastrun/cron.daily |
204 |
+ 15 4 * * 6 rm -f /var/spool/cron/lastrun/cron.weekly |
205 |
+ 30 5 1 * * rm -f /var/spool/cron/lastrun/cron.monthly |
206 |
+ EOF |
207 |
fi |
208 |
} |