From c5b079f71ac1182e94214710a34127520bc1b4e6 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 19 Apr 2013 09:35:40 +0000 Subject: Version bump. Update line count for secure_getenv() which still looks safe to ignore. (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) --- sys-fs/udev/ChangeLog | 9 +- sys-fs/udev/udev-202.ebuild | 463 +++++++++++++++++++++++++++++++++++++++++++ sys-fs/udev/udev-9999.ebuild | 4 +- 3 files changed, 473 insertions(+), 3 deletions(-) create mode 100644 sys-fs/udev/udev-202.ebuild (limited to 'sys-fs') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 34322a7a57cf..04f92d18282c 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.906 2013/04/18 17:57:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.907 2013/04/19 09:35:40 ssuominen Exp $ + +*udev-202 (19 Apr 2013) + + 19 Apr 2013; Samuli Suominen +udev-202.ebuild, + udev-9999.ebuild: + Version bump. Update line count for secure_getenv() which still looks safe to + ignore. 18 Apr 2013; Samuli Suominen udev-9999.ebuild: Use ac_cv_prog_ac_ct_GPERF instead of ac_cv_path_GPERF to disable diff --git a/sys-fs/udev/udev-202.ebuild b/sys-fs/udev/udev-202.ebuild new file mode 100644 index 000000000000..784dbbfb222a --- /dev/null +++ b/sys-fs/udev/udev-202.ebuild @@ -0,0 +1,463 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-202.ebuild,v 1.1 2013/04/19 09:35:40 ssuominen Exp $ + +EAPI=5 + +# accept4() patch is only in non-live version +if [[ ${PV} = 9999* ]]; then + KV_min=2.6.39 +else + KV_min=2.6.32 +fi + +inherit autotools eutils linux-info multilib toolchain-funcs versionator + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" + inherit git-2 +else + patchset=1 + SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" + if [[ -n "${patchset}" ]]; then + SRC_URI="${SRC_URI} + http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz + http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" + fi + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.20 + acl? ( sys-apps/acl ) + gudev? ( >=dev-libs/glib-2 ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + kmod? ( >=sys-apps/kmod-13 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + ! "${T}"/40-gentoo.rules + # Gentoo specific usb group + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + # Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868 + SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666" + EOF + + # Remove requirements for gettext and intltool wrt bug #443028 + if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then + sed -i \ + -e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \ + -e '/XML::Parser perl module is required for intltool/s|^|:|' \ + configure || die + eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true + eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true + fi + + # apply user patches + epatch_user + + # compile with older versions of gcc #451110 + version_is_at_least 4.6 $(gcc-version) || \ + sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h + + # change rules back to group uucp instead of dialout for now wrt #454556 + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ! -e configure ]]; then + if use doc; then + gtkdocize --docdir docs || die "gtkdocize failed" + else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + fi + eautoreconf + else + check_default_rules + elibtoolize + fi + + if ! use elibc_glibc; then #443030 + echo '#define secure_getenv(x) NULL' >> config.h.in + sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die + fi + + # link udevd(8) to systemd-udevd.service(8) manpage + echo '.so systemd-udevd.service.8' > "${T}"/udevd.8 +} + +src_configure() { + tc-export CC #463846 + use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760 + + local econf_args + + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --bindir=/bin + --docdir=/usr/share/doc/${PF} + --libdir=/usr/$(get_libdir) + --with-html-dir=/usr/share/doc/${PF}/html + --with-rootprefix= + --with-rootlibdir=/$(get_libdir) + --with-bashcompletiondir=/usr/share/bash-completion + --without-python + --disable-audit + --disable-coredump + --disable-hostnamed + --disable-ima + --disable-libcryptsetup + --disable-localed + --disable-logind + --disable-myhostname + --disable-nls + --disable-pam + --disable-quotacheck + --disable-readahead + --enable-split-usr + --disable-tcpwrap + --disable-timedated + --disable-xz + --disable-polkit + $(use_enable acl) + $(use_enable doc gtk-doc) + $(use_enable gudev) + $(use_enable keymap) + $(use_enable kmod) + $(use_enable selinux) + $(use_enable static-libs static) + ) + if use introspection; then + econf_args+=( + --enable-introspection=$(usex introspection) + ) + fi + if use firmware-loader; then + econf_args+=( + --with-firmware-path="/lib/firmware/updates:/lib/firmware" + ) + fi + econf "${econf_args[@]}" +} + +src_compile() { + echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra + emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES + local targets=( + libudev.la + systemd-udevd + udevadm + ata_id + cdrom_id + collect + scsi_id + v4l_id + accelerometer + mtd_probe + man/udev.7 + man/udevadm.8 + man/systemd-udevd.8 + man/systemd-udevd.service.8 + ) + use keymap && targets+=( keymap ) + use gudev && targets+=( libgudev-1.0.la ) + + emake "${targets[@]}" + if use doc; then + emake -C docs/libudev + use gudev && emake -C docs/gudev + fi +} + +src_install() { + local lib_LTLIBRARIES="libudev.la" \ + pkgconfiglib_DATA="src/libudev/libudev.pc" + + local targets=( + install-libLTLIBRARIES + install-includeHEADERS + install-libgudev_includeHEADERS + install-binPROGRAMS + install-rootlibexecPROGRAMS + install-udevlibexecPROGRAMS + install-dist_udevconfDATA + install-dist_udevhomeSCRIPTS + install-dist_udevkeymapDATA + install-dist_udevkeymapforcerelDATA + install-dist_udevrulesDATA + install-girDATA + install-man7 + install-man8 + install-pkgconfiglibDATA + install-sharepkgconfigDATA + install-typelibsDATA + install-dist_docDATA + libudev-install-hook + install-directories-hook + install-dist_bashcompletionDATA + ) + + if use gudev; then + lib_LTLIBRARIES+=" libgudev-1.0.la" + pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" + fi + + # add final values of variables: + targets+=( + rootlibexec_PROGRAMS=systemd-udevd + bin_PROGRAMS=udevadm + lib_LTLIBRARIES="${lib_LTLIBRARIES}" + MANPAGES="man/udev.7 man/udevadm.8 \ + man/systemd-udevd.service.8" + MANPAGES_ALIAS="man/systemd-udevd.8" + pkgconfiglib_DATA="${pkgconfiglib_DATA}" + INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ + $(sysconfdir)/udev/hwdb.d' + dist_bashcompletion_DATA="shell-completion/bash/udevadm" + ) + emake -j1 DESTDIR="${D}" "${targets[@]}" + if use doc; then + emake -C docs/libudev DESTDIR="${D}" install + use gudev && emake -C docs/gudev DESTDIR="${D}" install + fi + dodoc TODO + + prune_libtool_files --all + rm -f \ + "${D}"/lib/udev/rules.d/99-systemd.rules \ + "${D}"/usr/share/doc/${PF}/LICENSE.* + + # see src_prepare() for content of these files + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doman "${T}"/udevd.8 + + # install udevadm compatibility symlink + dosym {../bin,sbin}/udevadm + + # install udevd to /sbin and remove empty and redudant directory + # /lib/systemd because systemd is installed to /usr wrt #462750 + mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die + rm -r "${D}"/lib/systemd +} + +pkg_preinst() { + local htmldir + for htmldir in gudev libudev; do + if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then + rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir} + fi + if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then + dosym ../../doc/${PF}/html/${htmldir} \ + /usr/share/gtk-doc/html/${htmldir} + fi + done + preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0) +} + +pkg_postinst() { + mkdir -p "${ROOT}"run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT}"dev/loop 2>/dev/null + if [[ -d ${ROOT}dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # 64-device-mapper.rules is related to sys-fs/device-mapper which we block + # in favor of sys-fs/lvm2 + old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules + if [[ -f ${old_dm_rules} ]]; then + rm -f "${old_dm_rules}" + einfo "Removed unneeded file ${old_dm_rules}" + fi + + local fstab="${ROOT}"etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, http://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT}usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules + if [[ -f ${old_net_name} ]]; then + local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32 + MD5=$(md5sum < "${old_net_name}") + MD5=${MD5/ -/} + if [[ ${MD5} == ${old_net_sum} ]]; then + ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable" + ewarn "the new predictable network interface naming." + rm -f "${old_net_name}" + fi + fi + + local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + if has_version sys-apps/biosdevname; then + ewarn + ewarn "You have sys-apps/biosdevname installed which has been deprecated" + ewarn "in favor of the predictable network interface names." + fi + + ewarn + ewarn "The new predictable network interface names are used by default, see:" + ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "Example command to get the information for the new interface name before booting" + ewarn "(replace with, for example, eth0):" + ewarn "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" + ewarn + ewarn "You can use kernel commandline net.ifnames=0 to disable this feature." + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + + preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0) + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://wiki.gentoo.org/wiki/Udev/upgrade" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" + + # Update hwdb database in case the format is changed by udev version. + if use hwdb && has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index d134b0d4e9fe..71f36e0b4e5a 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.223 2013/04/18 17:57:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.224 2013/04/19 09:35:40 ssuominen Exp $ EAPI=5 @@ -122,7 +122,7 @@ pkg_setup() { src_prepare() { if ! [[ ${PV} = 9999* ]]; then # secure_getenv() disable for non-glibc systems wrt bug #443030 - if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then + if ! [[ $(grep -r secure_getenv * | wc -l) -eq 19 ]]; then eerror "The line count for secure_getenv() failed, see bug #443030" die fi -- cgit v1.2.3-65-gdbad