1 |
naota 12/04/02 10:22:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: freebsd-ubin-8.2-r1.ebuild |
5 |
Removed: freebsd-ubin-8.2.ebuild |
6 |
Log: |
7 |
Add patch to fix CVE-2011-2895. #408887 |
8 |
|
9 |
(Portage version: 2.2.0_alpha89/cvs/FreeBSD i386) |
10 |
|
11 |
Revision Changes Path |
12 |
1.77 sys-freebsd/freebsd-ubin/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog?rev=1.77&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog?rev=1.77&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog?r1=1.76&r2=1.77 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v |
21 |
retrieving revision 1.76 |
22 |
retrieving revision 1.77 |
23 |
diff -u -r1.76 -r1.77 |
24 |
--- ChangeLog 30 Mar 2012 15:49:52 -0000 1.76 |
25 |
+++ ChangeLog 2 Apr 2012 10:22:58 -0000 1.77 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for sys-freebsd/freebsd-ubin |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.76 2012/03/30 15:49:52 aballier Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.77 2012/04/02 10:22:58 naota Exp $ |
31 |
+ |
32 |
+*freebsd-ubin-8.2-r1 (02 Apr 2012) |
33 |
+ |
34 |
+ 02 Apr 2012; Naohiro Aota <naota@g.o> |
35 |
+ +files/freebsd-ubin-8.2-compress.patch, +freebsd-ubin-8.2-r1.ebuild, |
36 |
+ -freebsd-ubin-8.2.ebuild: |
37 |
+ Add patch to fix CVE-2011-2895. #408887 |
38 |
|
39 |
30 Mar 2012; Alexis Ballier <aballier@g.o> |
40 |
-freebsd-ubin-9.0_rc1.ebuild, -freebsd-ubin-9.0_rc2.ebuild, |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: freebsd-ubin-8.2-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild,v 1.1 2012/04/02 10:22:58 naota Exp $ |
54 |
|
55 |
EAPI=2 |
56 |
|
57 |
inherit bsdmk freebsd flag-o-matic pam |
58 |
|
59 |
DESCRIPTION="FreeBSD's base system source for /usr/bin" |
60 |
SLOT="0" |
61 |
KEYWORDS="~sparc-fbsd ~x86-fbsd" |
62 |
IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" |
63 |
LICENSE="BSD zfs? ( CDDL )" |
64 |
|
65 |
SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 |
66 |
mirror://gentoo/${CONTRIB}.tar.bz2 |
67 |
mirror://gentoo/${LIB}.tar.bz2 |
68 |
mirror://gentoo/${ETC}.tar.bz2 |
69 |
mirror://gentoo/${BIN}.tar.bz2 |
70 |
mirror://gentoo/${INCLUDE}.tar.bz2 |
71 |
zfs? ( mirror://gentoo/${CDDL}.tar.bz2 ) |
72 |
build? ( mirror://gentoo/${SYS}.tar.bz2 )" |
73 |
|
74 |
RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?] |
75 |
ssl? ( dev-libs/openssl ) |
76 |
kerberos? ( virtual/krb5 ) |
77 |
ar? ( app-arch/libarchive ) |
78 |
virtual/pam |
79 |
sys-libs/zlib |
80 |
>=sys-libs/ncurses-5.9 |
81 |
!dev-util/csup" |
82 |
|
83 |
DEPEND="${RDEPEND} |
84 |
sys-devel/flex |
85 |
!build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
86 |
=sys-freebsd/freebsd-mk-defs-${RV}*" |
87 |
|
88 |
RDEPEND="${RDEPEND} |
89 |
>=sys-auth/pambase-20080219.1 |
90 |
sys-process/cronbase" |
91 |
|
92 |
S="${WORKDIR}/usr.bin" |
93 |
|
94 |
PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
95 |
"${FILESDIR}/${PN}-6.0-fixmakefiles.patch" |
96 |
"${FILESDIR}/${PN}-setXid.patch" |
97 |
"${FILESDIR}/${PN}-lint-stdarg.patch" |
98 |
"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch" |
99 |
"${FILESDIR}/${PN}-8.0-xinstall.patch" |
100 |
"${FILESDIR}/${PN}-8.0-bsdar.patch" |
101 |
"${FILESDIR}/${P}-compress.patch" ) |
102 |
|
103 |
# Here we remove some sources we don't need because they are already |
104 |
# provided by portage's packages or similar. In order: |
105 |
# - Archiving tools, provided by their own ebuilds |
106 |
# - ncurses stuff |
107 |
# - less stuff |
108 |
# - bind utils |
109 |
# - rsh stuff |
110 |
# - binutils gprof |
111 |
# and the rest are misc utils we already provide somewhere else. |
112 |
REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
113 |
gzip gprof |
114 |
lzmainfo xz xzdec |
115 |
tput tset tabs |
116 |
less lessecho lesskey |
117 |
dig hesinfo nslookup nsupdate host |
118 |
rsh rlogin rusers rwho ruptime |
119 |
compile_et lex vi smbutil file vacation nc ftp telnet |
120 |
c99 c89 |
121 |
whois tftp" |
122 |
|
123 |
pkg_setup() { |
124 |
use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
125 |
use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
126 |
use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
127 |
use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
128 |
use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
129 |
use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
130 |
use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
131 |
use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
132 |
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
133 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
134 |
} |
135 |
|
136 |
pkg_preinst() { |
137 |
# bison installs a /usr/bin/yacc symlink ... |
138 |
# we need to remove it to avoid triggering |
139 |
# collision-protect errors |
140 |
if [[ -L ${ROOT}/usr/bin/yacc ]] ; then |
141 |
rm -f "${ROOT}"/usr/bin/yacc |
142 |
fi |
143 |
} |
144 |
|
145 |
src_prepare() { |
146 |
use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" |
147 |
|
148 |
# Rename manpage for renamed cmp |
149 |
mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die |
150 |
# Rename manpage for renamed ar |
151 |
mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die |
152 |
# Fix whereis(1) manpath search. |
153 |
sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" |
154 |
|
155 |
# Build a dynamic make |
156 |
sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die |
157 |
|
158 |
# Disable it here otherwise our patch wont apply |
159 |
use ar || dummy_mk ar |
160 |
} |
161 |
|
162 |
src_install() { |
163 |
freebsd_src_install |
164 |
|
165 |
# baselayout requires these in /bin |
166 |
dodir /bin |
167 |
for bin in sed printf; do |
168 |
mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" |
169 |
dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" |
170 |
done |
171 |
|
172 |
for pamdfile in login passwd su; do |
173 |
newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die |
174 |
done |
175 |
|
176 |
cd "${WORKDIR}/etc" |
177 |
insinto /etc |
178 |
doins remote phones opieaccess fbtab || die |
179 |
|
180 |
exeinto /etc/cron.daily |
181 |
newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die |
182 |
|
183 |
# tip requires /var/spool/lock/, bug #200700 |
184 |
keepdir /var/spool/lock |
185 |
} |
186 |
|
187 |
pkg_postinst() { |
188 |
# We need to ensure that login.conf.db is up-to-date. |
189 |
if [[ -e "${ROOT}"etc/login.conf ]] ; then |
190 |
einfo "Updating ${ROOT}etc/login.conf.db" |
191 |
"${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf |
192 |
elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" |
193 |
fi |
194 |
} |
195 |
|
196 |
pkg_postrm() { |
197 |
# and if we uninstall yacc but keep bison, |
198 |
# lets restore the /usr/bin/yacc symlink |
199 |
if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then |
200 |
ln -s yacc.bison "${ROOT}"/usr/bin/yacc |
201 |
fi |
202 |
} |