diff options
author | Tristan Heaven <tristan@gentoo.org> | 2012-07-04 21:59:07 +0000 |
---|---|---|
committer | Tristan Heaven <tristan@gentoo.org> | 2012-07-04 21:59:07 +0000 |
commit | 52da3047965afa3a8703f77d10ac0686e6e7f6b6 (patch) | |
tree | ede500e7b5965cb14acd799f2491a93483266062 /x11-misc | |
parent | Unmasked app-admin/eselect-awk, got tested on major archs (diff) | |
download | gentoo-2-52da3047965afa3a8703f77d10ac0686e6e7f6b6.tar.gz gentoo-2-52da3047965afa3a8703f77d10ac0686e6e7f6b6.tar.bz2 gentoo-2-52da3047965afa3a8703f77d10ac0686e6e7f6b6.zip |
Remove vulnerable versions, bug #421571
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/revelation/ChangeLog | 7 | ||||
-rw-r--r-- | x11-misc/revelation/files/revelation-0.4.11-build.patch | 124 | ||||
-rw-r--r-- | x11-misc/revelation/files/revelation-0.4.11-list-index.patch | 14 | ||||
-rw-r--r-- | x11-misc/revelation/revelation-0.4.11-r2.ebuild | 68 | ||||
-rw-r--r-- | x11-misc/revelation/revelation-0.4.13.ebuild | 65 |
5 files changed, 6 insertions, 272 deletions
diff --git a/x11-misc/revelation/ChangeLog b/x11-misc/revelation/ChangeLog index c0b035e4f598..8a34c88fb337 100644 --- a/x11-misc/revelation/ChangeLog +++ b/x11-misc/revelation/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/revelation # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/ChangeLog,v 1.28 2012/07/03 23:30:11 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/ChangeLog,v 1.29 2012/07/04 21:59:07 tristan Exp $ + + 04 Jul 2012; Tristan Heaven <tristan@gentoo.org> + -revelation-0.4.11-r2.ebuild, -files/revelation-0.4.11-build.patch, + -files/revelation-0.4.11-list-index.patch, -revelation-0.4.13.ebuild: + Remove vulnerable versions, bug #421571 03 Jul 2012; Jeff Horelick <jdhore@gentoo.org> revelation-0.4.14.ebuild: marked x86 per bug 421571 diff --git a/x11-misc/revelation/files/revelation-0.4.11-build.patch b/x11-misc/revelation/files/revelation-0.4.11-build.patch deleted file mode 100644 index b5c67e42aa6d..000000000000 --- a/x11-misc/revelation/files/revelation-0.4.11-build.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- acinclude.m4 -+++ acinclude.m4 -@@ -83,7 +83,6 @@ - AC_DEFUN([RVL_PYGTK], [ - PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.8.0]) - PKG_CHECK_MODULES(GNOME_PYTHON, [gnome-python-2.0 >= 2.10.0]) -- PKG_CHECK_MODULES(GNOME_PYTHON_EXTRAS, [gnome-python-extras-2.0 >= 2.10.0]) - - AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) - ---- configure.ac -+++ configure.ac -@@ -12,6 +12,7 @@ - - dnl check for dependencies - AC_PROG_CC() -+AC_PROG_LIBTOOL - - RVL_PYTHON_PATH(2.3) - RVL_PYGTK() -@@ -26,11 +27,17 @@ - RVL_PYTHON_MODULE(gconf, yes) - RVL_PYTHON_MODULE(gtk, yes) - RVL_PYTHON_MODULE(gnome, yes) --RVL_PYTHON_MODULE(gnomeapplet, yes) - RVL_PYTHON_MODULE(gnomevfs, yes) - RVL_PYTHON_MODULE(gobject, yes) - RVL_PYTHON_MODULE(pango, yes) - -+AC_ARG_ENABLE([applet], -+ [AS_HELP_STRING([--enable-applet], [install the panel applet])], -+ [enable_applet="${enableval}"], [enable_applet="no"]) -+AM_CONDITIONAL([ENABLE_APPLET], [test "${enable_applet}" = "yes"]) -+if test "${enable_applet}" = "yes" ; then -+ RVL_PYTHON_MODULE([gnomeapplet], [yes]) -+fi - - dnl output files - AC_OUTPUT([ ---- data/bonobo/Makefile.am -+++ data/bonobo/Makefile.am -@@ -6,10 +6,13 @@ - # - - serverdir = $(libdir)/bonobo/servers --server_DATA = GNOME_RevelationApplet.server - CLEANFILES = GNOME_RevelationApplet.server - EXTRA_DIST = GNOME_RevelationApplet.server.in - -+if ENABLE_APPLET -+server_DATA = GNOME_RevelationApplet.server -+endif -+ - GNOME_RevelationApplet.server: GNOME_RevelationApplet.server.in - sed \ - -e "s|\@libexecdir\@|$(libexecdir)|" \ ---- data/gconf/Makefile.am -+++ data/gconf/Makefile.am -@@ -6,7 +6,11 @@ - # - - schemadir = @GCONF_SCHEMA_FILE_DIR@ --dist_schema_DATA = revelation.schemas revelation-applet.schemas -+dist_schema_DATA = revelation.schemas -+ -+if ENABLE_APPLET -+dist_schema_DATA += revelation-applet.schemas -+endif - - - install-data-hook: ---- src/Makefile.am -+++ src/Makefile.am -@@ -7,10 +7,12 @@ - - SUBDIRS = bundle lib wrap - bin_SCRIPTS = revelation --libexec_SCRIPTS = revelation-applet - EXTRA_DIST = revelation.in revelation-applet.in - CLEANFILES = revelation revelation-applet - -+if ENABLE_APPLET -+libexec_SCRIPTS = revelation-applet -+endif - - revelation: revelation.in - sed \ ---- src/wrap/crack/crack.c -+++ src/wrap/crack/crack.c -@@ -24,8 +24,6 @@ - - #define FILENAME_MAXLEN 512 - --static char DEFAULT_DICTPATH[] = "/usr/local/share/revelation/pwdict"; -- - static char crack_FascistCheck_doc [] = - "arguments: passwd, dictpath (optional)\n" - "\n" ---- src/wrap/crack/Makefile.am -+++ src/wrap/crack/Makefile.am -@@ -5,19 +5,9 @@ - # - --module_PROGRAMS = crack.so - moduledir = $(pyexecdir)/revelation --CLEANFILES = crack.c --EXTRA_DIST = crack.c.in -- --crack.c: crack.c.in -- sed \ -- -e "s|\@CRACK_DICTPATH\@|@CRACK_DICTPATH@|" \ -- crack.c.in >crack.c -- --crack.o: crack.c -- $(CC) -pthread -fno-strict-aliasing -fPIC -I${PYTHON_INCLUDE} -c crack.c -o crack.o -- --crack.so: crack.o -- $(CC) -Wl --export-dynamic -pthread -shared crack.o -lcrack -o crack.so -- -+module_LTLIBRARIES = crack.la -+crack_la_SOURCES = crack.c -+crack_la_CFLAGS = -Wall -+crack_la_CPPFLAGS = -I$(PYTHON_INCLUDE) -DDEFAULT_DICTPATH="\"$(CRACK_DICTPATH)\"" -+crack_la_LDFLAGS = -avoid-version -module -shared diff --git a/x11-misc/revelation/files/revelation-0.4.11-list-index.patch b/x11-misc/revelation/files/revelation-0.4.11-list-index.patch deleted file mode 100644 index efbbc0af2dad..000000000000 --- a/x11-misc/revelation/files/revelation-0.4.11-list-index.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/lib/ui.py.orig 2008-10-04 14:23:30.000000000 +0200 -+++ src/lib/ui.py 2008-10-04 14:23:46.000000000 +0200 -@@ -1257,8 +1257,9 @@ - def __init__(self, stock, text = None): - gtk.ImageMenuItem.__init__(self, stock) - -- self.label = self.get_children()[0] -- self.image = self.get_children()[1] -+ children=self.get_children() -+ if len(children) > 0 : self.label = children[0] -+ if len(children) > 1 : self.image = children[1] - - if text is not None: - self.set_text(text) diff --git a/x11-misc/revelation/revelation-0.4.11-r2.ebuild b/x11-misc/revelation/revelation-0.4.11-r2.ebuild deleted file mode 100644 index ee28ac19348f..000000000000 --- a/x11-misc/revelation/revelation-0.4.11-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.11-r2.ebuild,v 1.10 2012/05/22 16:46:15 tristan Exp $ - -EAPI=4 - -PYTHON_DEPEND="2" - -inherit autotools eutils multilib python gnome2 - -DESCRIPTION="A password manager for GNOME" -HOMEPAGE="http://oss.codepoet.no/revelation/" -SRC_URI="ftp://oss.codepoet.no/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="applet" -RESTRICT="test" - -RDEPEND="dev-python/pygtk - dev-python/pycrypto - dev-python/gconf-python - dev-python/gnome-vfs-python - dev-python/libbonobo-python - dev-python/libgnome-python - sys-libs/cracklib - applet? ( dev-python/gnome-applets-python )" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-list-index.patch \ - "${FILESDIR}"/${P}-build.patch - eautoreconf - python_convert_shebangs -r 2 . - gnome2_src_prepare - echo -n > py-compile -} - -src_configure() { - gnome2_src_configure \ - --disable-dependency-tracking \ - --disable-desktop-update \ - --disable-mime-update \ - $(use_enable applet) -} - -src_install() { - dodoc AUTHORS ChangeLog NEWS README TODO - gnome2_src_install - python_clean_installation_image -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize ${PN} -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup ${PN} -} diff --git a/x11-misc/revelation/revelation-0.4.13.ebuild b/x11-misc/revelation/revelation-0.4.13.ebuild deleted file mode 100644 index 54b9c673bc7c..000000000000 --- a/x11-misc/revelation/revelation-0.4.13.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.13.ebuild,v 1.2 2012/05/29 11:32:46 tristan Exp $ - -EAPI=4 - -PYTHON_DEPEND="2" -GCONF_DEBUG="no" - -inherit python gnome2 - -DESCRIPTION="A password manager for GNOME" -HOMEPAGE="http://revelation.olasagasti.info/" -SRC_URI="https://bitbucket.org/erikg/revelation/downloads/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="applet" -RESTRICT="test" - -RDEPEND="dev-python/pygtk - dev-python/pycrypto - dev-python/gconf-python - dev-python/libgnome-python - sys-libs/cracklib[python] - applet? ( - dev-python/gnome-applets-python - dev-python/libbonobo-python - )" -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - python_convert_shebangs -r 2 . - gnome2_src_prepare - echo -n > py-compile -} - -src_configure() { - gnome2_src_configure \ - --disable-desktop-update \ - --disable-mime-update \ - $(use_with applet) -} - -src_install() { - dodoc AUTHORS ChangeLog NEWS README TODO - gnome2_src_install - python_clean_installation_image -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize ${PN} -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup ${PN} -} |