From 70f8e930f3894846fea37ecf6a81409baaa24a97 Mon Sep 17 00:00:00 2001 From: wiktor w brodlo Date: Thu, 16 Jun 2011 12:19:39 +0000 Subject: Fixed patches --- app-admin/anaconda/Manifest | 8 +- app-admin/anaconda/anaconda-0.9.9.55.ebuild | 216 +++++++++++++++++++++ app-admin/anaconda/anaconda-9999.ebuild | 47 ++--- app-admin/anaconda/files/audit-glibc-fix.patch | 4 +- .../anaconda/files/libselinux-glibc-fix.patch | 4 +- sys-block/open-iscsi/Manifest | 2 +- .../open-iscsi/open-iscsi-2.0.870.3-r1.ebuild | 2 +- 7 files changed, 252 insertions(+), 31 deletions(-) create mode 100644 app-admin/anaconda/anaconda-0.9.9.55.ebuild diff --git a/app-admin/anaconda/Manifest b/app-admin/anaconda/Manifest index 07e559f..d4e2d3a 100644 --- a/app-admin/anaconda/Manifest +++ b/app-admin/anaconda/Manifest @@ -1,8 +1,10 @@ -AUX audit-glibc-fix.patch 355 RMD160 798d97833a57254e17fbce9744f215b9ab78e432 SHA1 38030d193fafa9b57b877e01e1e3230578cf4222 SHA256 ce08adf509e6d9a2267636de9742e9a05fd8643dc6a87a99a00542b2f96941fc +AUX audit-glibc-fix.patch 325 RMD160 749001d6acc95d24b2c722a866acb414802d0018 SHA1 ea2797106fff8b92db9cdd44401182e054068bec SHA256 e8ec4c8a20fa17286b688c2ad501a075749a6b478658905adefb44df6c6845fd AUX compat.py 461 RMD160 ae776a51f27564321845126c39874eab953a41cd SHA1 229eea09e82b4e93150ece0f0621ac4581ccb00b SHA256 d3b3efe9b9fd946c917a6faccca715c4056748b9c861080fe6f6d7cfbaf87f50 -AUX libselinux-glibc-fix.patch 319 RMD160 1371e641bcd9eae7f4eba827881dcd4f59ade9f2 SHA1 a08ce1c659fe0929276cf469864cded98a6f3616 SHA256 9c4d42280b81e84b0e5dcedbefd2d3d31bd565ed2249e85d4d4a2f98039e0d1e +AUX libselinux-glibc-fix.patch 277 RMD160 212f7e529fabb3bb0a00b262a7d0dbf8895281f5 SHA1 e6982a27d284f214b859364d76fa7e8cd0fd8fe7 SHA256 add3156bb12439a48fb7166bf25ef7b51f53c8a750813546f33fe5d54c9645cb AUX liveinst 40 RMD160 39595adfb6c90dcf5b30d1ebdd7f0fac224d6d16 SHA1 4ec5b3c634341ca1e856fbffe69a61236f8335af SHA256 32721c6398f6b7e77e45ed5cbbe32c15b9b2ae424311ae4fe77d95c2b17a8af3 AUX make_liveinst_update_package.sh 653 RMD160 0c7e88651d03d25210ca36500e28e0bc2caa7172 SHA1 abf190bf40d5d8b0ddd0ff99a69c5096b47c949b SHA256 cfec6af92438e670dbc3341519e65a6847640003708a07e6d78aca187d307d2c +DIST anaconda-0.9.9.55.tar.bz2 13343746 RMD160 dbe9ae841f496f6d7ecd3ba5c81073441f62a12b SHA1 9dcdfbee35c96ef06eec620297fc2486c003a1f3 SHA256 2e97082ca36e9a042eee2fe4303a6790c60880658b84b49709399c08cc8fbc36 DIST audit-1.7.9.tar.gz 1245155 RMD160 248ca395c6d58dccf8437750e6cf5a7040a28c9f SHA1 aa7de4546f4774338946987fe1a8231222475e64 SHA256 95ce67d9aee4339a5aa11214f21dfa5f37c5820e2511c7bddf998d26b1aaefc9 DIST libselinux-2.0.85.tar.gz 175396 RMD160 ce27fc9c5baf23d9f1c2eeda24357abc4d619d48 SHA1 b2e29934f3cde0a2fb86fe29c8cc1abac8c7e9ca SHA256 54db845fbaa2b3183798e6754b11e4178802f9eae47569b391d87a45b8a69c3c -EBUILD anaconda-9999.ebuild 6690 RMD160 04c1efe71cb2d29de4ec9bc195dd256d9b97dc98 SHA1 85a185266e4f4e02ae77417b17137dfac6e010eb SHA256 21ad07b93c1f018a339db6db72f85e2899141f2333a84d3295cc66a885c83305 +EBUILD anaconda-0.9.9.55.ebuild 6702 RMD160 a0d41052690730e5b0222c0224af20118e762b69 SHA1 48760f2641e63e8743081818ba988617fb893f4a SHA256 bee46a595e7557eb6a50107715635c7a5a34eef791a88666557b7235f6cb35ef +EBUILD anaconda-9999.ebuild 6541 RMD160 66bf3139130c8d8a7ac57700d9aec405717069a7 SHA1 70a320f9c71414a49aa71999db17e718f77995e8 SHA256 475f24cffb3d4f145ff0896a3d733f71bf3629c75d07d121cd803f15f7be8c7e diff --git a/app-admin/anaconda/anaconda-0.9.9.55.ebuild b/app-admin/anaconda/anaconda-0.9.9.55.ebuild new file mode 100644 index 0000000..1bd32be --- /dev/null +++ b/app-admin/anaconda/anaconda-0.9.9.55.ebuild @@ -0,0 +1,216 @@ +# Copyright 2004-2010 Sabayon +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +if [ "${PV}" = "9999" ]; then + EGIT_COMMIT="master" + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/anaconda.git" + MY_ECLASS="git" +fi +inherit flag-o-matic base python libtool autotools eutils ${MY_ECLASS} + +AUDIT_VER="1.7.9" +AUDIT_SRC_URI="http://people.redhat.com/sgrubb/audit/audit-${AUDIT_VER}.tar.gz" + +SEPOL_VER="2.0" +LSELINUX_VER="2.0.85" +LSELINUX_SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/libselinux-${LSELINUX_VER}.tar.gz" + +DESCRIPTION="Gentoo Redhat Anaconda Installer Port" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=summary" +if [ "${PV}" = "9999" ]; then + SRC_URI="${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" + KEYWORDS="" +else + SRC_URI="http://distfiles.sabayon.org/${CATEGORY}/${PN}-${PVR}.tar.bz2 ${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" + KEYWORDS="~amd64 ~x86" +fi +S="${WORKDIR}"/${PN}-${PVR} +AUDIT_S="${WORKDIR}/audit-${AUDIT_VER}" +LSELINUX_S="${WORKDIR}/libselinux-${LSELINUX_VER}" + +LICENSE="GPL-2 public-domain" +SLOT="0" +IUSE="+ipv6 +nfs ldap" + +AUDIT_DEPEND="dev-lang/swig" +AUDIT_RDEPEND="ldap? ( net-nds/openldap )" +LSELINUX_DEPEND="=sys-libs/libsepol-${SEPOL_VER}* dev-lang/swig" +LSELINUX_RDEPEND="=sys-libs/libsepol-${SEPOL_VER}*" +LSELINUX_CONFLICT="!sys-libs/libselinux" # due to pythonX.Y/site-packages+/usr/sbin not being handled +COMMON_DEPEND="app-admin/system-config-keyboard + >=app-arch/libarchive-2.8 + app-cdr/isomd5sum + dev-libs/newt + nfs? ( net-fs/nfs-utils ) + sys-fs/lvm2 + =sys-block/open-iscsi-2.0.870.3-r1" +DEPEND="${COMMON_DEPEND} ${AUDIT_DEPEND} ${LSELINUX_DEPEND} sys-apps/sed" +RDEPEND="${COMMON_DEPEND} ${AUDIT_RDEPEND} + ${LSELINUX_RDEPEND} ${LSELINUX_CONFLICT} + app-misc/anaconda-runtime + app-misc/anaconda-runtime-gui" + +src_unpack() { + if [ "${PV}" = "9999" ]; then + git_src_unpack + base_src_unpack + else + base_src_unpack + fi + # Patch the internal libs to fix new glibc incompatibility + epatch "${FILESDIR}/audit-glibc-fix.patch" + epatch "${FILESDIR}/libselinux-glibc-fix.patch" +} + +src_prepare() { + + # Setup CFLAGS, LDFLAGS + append-cflags "-I${D}/usr/include/anaconda-runtime" + append-ldflags "-L${D}/usr/$(get_libdir)/anaconda-runtime" + + # Setup anaconda + cd "${S}" + ./autogen.sh || die "cannot run autogen" + + ## + ## Setup libaudit + ## + cd "${AUDIT_S}" + # Do not build GUI tools + sed -i \ + -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ + "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac" + sed -i \ + -e 's,system-config-audit,,g' \ + -e '/^SUBDIRS/s,\\$,,g' \ + "${AUDIT_S}"/Makefile.am || die "cannot sed libaudit Makefile.am" + rm -rf "${AUDIT_S}"/system-config-audit + + if ! use ldap; then + sed -i \ + -e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \ + "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac (ldap)" + sed -i \ + -e '/^SUBDIRS/s,zos-remote,,g' \ + "${AUDIT_S}"/audisp/plugins/Makefile.am || die "cannot sed libaudit Makefile.am (ldap)" + fi + eautoreconf + +} + +copy_audit_data_over() { + dodir "/usr/$(get_libdir)/anaconda-runtime" + cp -Ra "${AUDIT_S}/fakeroot/usr/$(get_libdir)/anaconda-runtime/"* \ + "${D}/usr/$(get_libdir)/anaconda-runtime" || die "cannot cp audit data" + dodir "/usr/include/anaconda-runtime" + cp -Ra "${AUDIT_S}/fakeroot/usr/include/anaconda-runtime/"* \ + "${D}/usr/include/anaconda-runtime" || die "cannot cp audit include data" +} + +src_configure() { + # configure audit + cd "${AUDIT_S}" + einfo "configuring audit" + econf --sbindir=/sbin --libdir=/usr/$(get_libdir)/anaconda-runtime \ + --includedir=/usr/include/anaconda-runtime \ + --without-prelude || die + + # compiling audit here, anaconda configure needs libaudit + einfo "compiling audit" + cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}" + base_src_compile + + # installing audit + einfo "installing audit libs into ${AUDIT_S}/fakeroot temporarily" + cd "${AUDIT_S}" || die "cannot cd into ${AUDIT_S}" + ( rm -rf fakeroot && mkdir fakeroot ) || die "cannot mkdir" + emake DESTDIR="${AUDIT_S}/fakeroot" install || die "cannot install libaudit" + copy_audit_data_over # for proper linking + + # configure anaconda + cd "${S}" + einfo "configuring anaconda" + econf \ + $(use_enable ipv6) $(use_enable selinux) \ + $(use_enable nfs) || die "configure failed" +} + +src_compile() { + + cd "${S}" + base_src_compile + + # compiling libselinux + einfo "compiling libselinux" + cd "${LSELINUX_S}" || die "cannot cd into ${LSELINUX_S}" + LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ + emake \ + LDFLAGS="-fPIC ${LDFLAGS}" \ + PYLIBVER="python$(python_get_version)" \ + PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ + SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ + INCLUDEDIR="${D}/usr/include/anaconda-runtime" \ + all || die + LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ + emake \ + LDFLAGS="-fPIC ${LDFLAGS}" \ + PYLIBVER="python$(python_get_version)" \ + PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ + SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ + INCLUDEDIR="${D}/usr/include/anaconda-runtime" \ + pywrap || die + + # add compatibility aliases to swig wrapper + cat "${FILESDIR}/compat.py" >> "${LSELINUX_S}/src/selinux.py" || die + +} + +src_install() { + + # installing libselinux + cd "${LSELINUX_S}" + python_need_rebuild + LD_RUN_PATH="/usr/$(get_libdir)/anaconda-runtime" \ + emake DESTDIR="${D}" \ + PYLIBVER="python$(python_get_version)" \ + PYTHONLIBDIR="${D}/usr/$(get_libdir)/python$(python_get_version)" \ + LIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ + SHLIBDIR="${D}/usr/$(get_libdir)/anaconda-runtime" \ + INCLUDEDIR="${D}/usr/include/anaconda-runtime" \ + install install-pywrap || die + + # fix libselinux.so link + dosym libselinux.so.1 /usr/$(get_libdir)/anaconda-runtime/libselinux.so + # LD_RUN_PATH works with ld >=2.20, so /etc/env.d/99anaconda for now + # will be dropped in future + echo "LDPATH=\"/usr/$(get_libdir)/anaconda-runtime\"" > 99anaconda + doenvd 99anaconda + + cd "${S}" + copy_audit_data_over # ${D} is cleared + base_src_install + + # install liveinst for user + dodir /usr/bin + exeinto /usr/bin + doexe "${FILESDIR}"/liveinst + dosym /usr/bin/liveinst /usr/bin/installer + + # drop .la files for God sake + find "${D}" -name "*.la" | xargs rm + + # Cleanup .pyc .pyo + find "${D}" -name "*.py[co]" -type f -delete + +} + +pkg_postrm() { + python_mod_cleanup $(python_get_sitedir)/py${PN} +} + +pkg_postinst() { + python_mod_optimize $(python_get_sitedir)/py${PN} +} diff --git a/app-admin/anaconda/anaconda-9999.ebuild b/app-admin/anaconda/anaconda-9999.ebuild index 7e60894..161bb5c 100644 --- a/app-admin/anaconda/anaconda-9999.ebuild +++ b/app-admin/anaconda/anaconda-9999.ebuild @@ -24,7 +24,7 @@ if [ "${PV}" = "9999" ]; then SRC_URI="${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" KEYWORDS="" else - SRC_URI="mirror://sabayon/${CATEGORY}/${PN}-${PVR}.tar.bz2 ${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" + SRC_URI="http://distfiles.sabayon.org/${CATEGORY}/${PN}-${PVR}.tar.bz2 ${AUDIT_SRC_URI} ${LSELINUX_SRC_URI}" KEYWORDS="~amd64 ~x86" fi S="${WORKDIR}"/${PN}-${PVR} @@ -60,9 +60,6 @@ src_unpack() { else base_src_unpack fi - # Patch the internal libs to fix new glibc incompatibility - epatch "${FILESDIR}/audit-glibc-fix.patch" - epatch "${FILESDIR}/libselinux-glibc-fix.patch" } src_prepare() { @@ -79,26 +76,32 @@ src_prepare() { ## Setup libaudit ## cd "${AUDIT_S}" - # Do not build GUI tools - sed -i \ - -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac" - sed -i \ - -e 's,system-config-audit,,g' \ - -e '/^SUBDIRS/s,\\$,,g' \ - "${AUDIT_S}"/Makefile.am || die "cannot sed libaudit Makefile.am" - rm -rf "${AUDIT_S}"/system-config-audit - - if ! use ldap; then - sed -i \ - -e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \ - "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac (ldap)" - sed -i \ - -e '/^SUBDIRS/s,zos-remote,,g' \ - "${AUDIT_S}"/audisp/plugins/Makefile.am || die "cannot sed libaudit Makefile.am (ldap)" - fi + # Patch libaudit to fix new glibc incompatibility + epatch "${FILESDIR}/audit-glibc-fix.patch" + # Do not build GUI tools + sed -i \ + -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ + "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac" + sed -i \ + -e 's,system-config-audit,,g' \ + -e '/^SUBDIRS/s,\\$,,g' \ + "${AUDIT_S}"/Makefile.am || die "cannot sed libaudit Makefile.am" + rm -rf "${AUDIT_S}"/system-config-audit + + if ! use ldap; then + sed -i \ + -e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \ + "${AUDIT_S}"/configure.ac || die "cannot sed libaudit configure.ac (ldap)" + sed -i \ + -e '/^SUBDIRS/s,zos-remote,,g' \ + "${AUDIT_S}"/audisp/plugins/Makefile.am || die "cannot sed libaudit Makefile.am (ldap)" + fi eautoreconf + # Patch libselinux to fix new glibc incompatibility + cd "${LSELINUX_S}" + epatch "${FILESDIR}/libselinux-glibc-fix.patch" + } copy_audit_data_over() { diff --git a/app-admin/anaconda/files/audit-glibc-fix.patch b/app-admin/anaconda/files/audit-glibc-fix.patch index ccc0168..15461b7 100644 --- a/app-admin/anaconda/files/audit-glibc-fix.patch +++ b/app-admin/anaconda/files/audit-glibc-fix.patch @@ -1,5 +1,5 @@ ---- ../audit-1.7.9.orig/lib/libaudit.c 2008-11-05 18:56:26.000000000 +0000 -+++ ../audit-1.7.9/lib/libaudit.c 2011-06-09 22:18:36.861689444 +0000 +--- lib.orig/libaudit.c 2008-11-05 18:56:26.000000000 +0000 ++++ lib/libaudit.c 2011-06-09 22:18:36.861689444 +0000 @@ -36,6 +36,7 @@ #include #include /* O_NOFOLLOW needs gnu defined */ diff --git a/app-admin/anaconda/files/libselinux-glibc-fix.patch b/app-admin/anaconda/files/libselinux-glibc-fix.patch index d9a9040..d4a8d42 100644 --- a/app-admin/anaconda/files/libselinux-glibc-fix.patch +++ b/app-admin/anaconda/files/libselinux-glibc-fix.patch @@ -1,5 +1,5 @@ ---- ../libselinux-2.0.85.orig/src/label_file.c 2009-07-31 02:14:16.000000000 +0000 -+++ ../libselinux-2.0.85/src/label_file.c 2011-06-09 22:23:07.790689224 +0000 +--- src.orig/label_file.c 2009-07-31 02:14:16.000000000 +0000 ++++ src/label_file.c 2011-06-09 22:23:07.790689224 +0000 @@ -17,6 +17,7 @@ #include #include diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest index 9a795dc..ddf3b8b 100644 --- a/sys-block/open-iscsi/Manifest +++ b/sys-block/open-iscsi/Manifest @@ -31,5 +31,5 @@ AUX redhat/open-iscsi-2.0-870.1-fwparam-ppc-crash.patch 1715 RMD160 587fe8033621 AUX redhat/open-iscsi-2.0-870.1-ibft-newer-kernel.patch 1144 RMD160 88c2b9c95e6e49ab9cb9c49077e1ac4e72ab95ee SHA1 6f2a0ed60057f6baf419ddfec1b8e2cdf202acc2 SHA256 8b1043783be68afaf3fa01364e900b1b0ec94685ea5531d7128ee442654bfefb AUX redhat/open-iscsi-2.0-870.1-no-exit.patch 4985 RMD160 318d9c4bec7d2dcbcf8f589017f55f8eeb2dc8fc SHA1 0d2c37af9e617605532f11653342fefc03031e07 SHA256 375480ce5096219b92ab9cc4afaeaa2595bd3098fc8a3fb3bbae3afc7df492e1 DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec -EBUILD open-iscsi-2.0.870.3-r1.ebuild 4604 RMD160 41c343917ccb9f069d1f22f6c5bc30f269a21882 SHA1 17437ce23c91110ae9558aa23947d74cacbe2908 SHA256 b6a4612123c3c985de91f81d696ba2b4a658eb43854b2b83f33169493b83b3bf +EBUILD open-iscsi-2.0.870.3-r1.ebuild 4614 RMD160 396daef4756429584f7de18f17b2f9646cbba924 SHA1 0baee157e946238a1940d5d51e26cb7437e3812b SHA256 0ceab53fb9e88d74f212c57b240f1178a7c941508fd1ef326bf556dad2469c15 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild index 58c35b2..d938acd 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc ~mips" IUSE="modules utils debug" DEPEND="virtual/linux-sources app-doc/doxygen" -RDEPEND="virtual/modutils sys-apps/util-linux" +RDEPEND="sys-apps/module-init-tools sys-apps/util-linux" S="${WORKDIR}/${MY_PV}" -- cgit v1.2.3-65-gdbad