* [gentoo-commits] repo/gentoo:master commit in: app-crypt/cryptkeeper/, profiles/, app-crypt/cryptkeeper/files/
@ 2017-03-12 21:24 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2017-03-12 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 0625e74f6445ed4dfac4c91eb92c851dbbcccd4c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 21:22:08 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 21:24:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0625e74f
app-crypt/cryptkeeper: Remove last-rited pkg, #607772
app-crypt/cryptkeeper/Manifest | 1 -
app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild | 43 ------------------
.../files/cryptkeeper-0.9.5-binutils-gold.patch | 15 ------
...ryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch | 18 --------
...cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch | 17 -------
...cryptkeeper-0.9.5-is_mounted_overflow_fix.patch | 53 ----------------------
app-crypt/cryptkeeper/metadata.xml | 18 --------
profiles/package.mask | 11 -----
8 files changed, 176 deletions(-)
diff --git a/app-crypt/cryptkeeper/Manifest b/app-crypt/cryptkeeper/Manifest
deleted file mode 100644
index 51017343cf6..00000000000
--- a/app-crypt/cryptkeeper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptkeeper-0.9.5.tar.gz 222671 SHA256 1f9805d31562e448bf9bc11fdc2879f908ba42bfef5ad6adfa3877fc3b306984 SHA512 824c8b941d46904dd7f4b12a5f217aba25c848e016473d44ec71739baec78a7782dd00bb5d0c5dafc947235eddf558b8fe01a92e23b88b23352a05d0389cea3d WHIRLPOOL 7cf04ef6626cfc49d773ba67b83ab54f5d47d16a88d1541a9d1d8d3d2add9c744403759904ed2fce1feda0f9a654eeec39e8fd0c169418823b60300917b63ab4
diff --git a/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild b/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild
deleted file mode 100644
index ffb5d488fcd..00000000000
--- a/app-crypt/cryptkeeper/cryptkeeper-0.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit base eutils gnome2
-
-DESCRIPTION="EncFS system tray applet for GNOME"
-HOMEPAGE="http://tom.noflag.org.uk/cryptkeeper.html"
-SRC_URI="http://tom.noflag.org.uk/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="gnome-base/gconf:2
- >=sys-fs/encfs-1.7.2
- >=sys-fs/fuse-2.8.0
- gnome-extra/zenity"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}-binutils-gold.patch"
- "${FILESDIR}/${P}-fix_cryptkeeper.desktop.patch"
- "${FILESDIR}/${P}-fix-ftbfs-gcc-4.7-672010.patch"
- "${FILESDIR}/${P}-is_mounted_overflow_fix.patch"
-)
-
-DOCS="TODO"
-
-src_prepare() {
- base_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch
deleted file mode 100644
index 87522259250..00000000000
--- a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-binutils-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fixes a build failure using binutils-gold
-Author: Franceco Namuri <francesco@namuri.it>
-Index: cryptkeeper-0.9.5/configure
-===================================================================
---- cryptkeeper-0.9.5.orig/configure 2009-10-18 13:58:01.000000000 +0200
-+++ cryptkeeper-0.9.5/configure 2011-12-11 12:04:13.045285159 +0100
-@@ -6707,7 +6707,7 @@
-
- CFLAGS="$CFLAGS $DEP_CFLAGS $GNOME_KEYRING_CFLAGS"
- CXXFLAGS="$CFLAGS"
--LIBS="$DEP_LIBS $GNOME_KEYRING_LIBS"
-+LIBS="-lX11 $DEP_LIBS $GNOME_KEYRING_LIBS"
-
- #AC_PROG_LIBTOOL
-
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch
deleted file mode 100644
index e9f9f018bc2..00000000000
--- a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix-ftbfs-gcc-4.7-672010.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: add missing include to avoid FTBFS with gcc 4.7
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/672010
-Forwarded: no
-Author: Paul Tagliamonte <tag@pault.ag>
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2012-05-15
-
---- a/src/lsof.cpp 2012-05-09 21:27:01.138367215 -0400
-+++ b/src/lsof.cpp 2012-05-09 21:26:52.398367682 -0400
-@@ -21,6 +21,7 @@
- #include <vector>
- #include <assert.h>
- #include <cstring>
-+#include <unistd.h>
- #include "lsof.h"
-
- fsuser::fsuser(const char *pid, const char *name)
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch
deleted file mode 100644
index 464f3ca7795..00000000000
--- a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-fix_cryptkeeper.desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixes the category of cryptkeeper menu item
-Author: Francesco Namuri <francesco@namuri.it>
-Index: cryptkeeper-0.9.5/cryptkeeper.desktop
-===================================================================
---- cryptkeeper-0.9.5.orig/cryptkeeper.desktop 2011-12-11 12:04:59.053286893 +0100
-+++ cryptkeeper-0.9.5/cryptkeeper.desktop 2011-12-11 12:05:02.777287034 +0100
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Cryptkeeper
- Exec=cryptkeeper
- Icon=cryptkeeper
--Categories=Application;System;
-+Categories=System;GTK;Security;
- Terminal=false
- Type=Application
- StartupNotify=false
diff --git a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch b/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch
deleted file mode 100644
index c2a9a0ca008..00000000000
--- a/app-crypt/cryptkeeper/files/cryptkeeper-0.9.5-is_mounted_overflow_fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 86b960a528df7118ab43b629bbd906db7459300d
-Author: Jon Dowland <jmtd@debian.org>
-Date: Sun May 22 12:48:39 2011 +0100
-
- fix is_mounted (memory leaks and NULL access)
-
- Ensure that the return of realpath is checked for NULL before
- access. Ensure that the return value is free'd before it falls
- out of scope. Related tidying up.
-
-diff --git a/src/encfs_wrapper.cpp b/src/encfs_wrapper.cpp
-index 347337b..961818b 100644
---- a/src/encfs_wrapper.cpp
-+++ b/src/encfs_wrapper.cpp
-@@ -33,24 +33,24 @@
-
- bool is_mounted(const char *mount_dir)
- {
-+ struct mntent *m;
- FILE *f = setmntent("/etc/mtab", "r");
-- char *mount_dir_expanded = realpath(mount_dir, NULL);
-- if (mount_dir_expanded == NULL) {
-- // no such file or dir, ...
-- // so: not mounted
-- // perror("cryptkeeper, is_mounted");
-+ char *mount_dir_expanded, *mnt_dir_expanded;
-+
-+ if (!(mount_dir_expanded = realpath(mount_dir, NULL)))
- return false;
-- }
-- for (;;) {
-- char *mnt_dir_expanded;
-- struct mntent *m = getmntent(f);
-- if (!m) break;
-- mnt_dir_expanded = realpath(m->mnt_dir, NULL);
-- if (strcmp(mount_dir_expanded, mnt_dir_expanded)==0) {
-+
-+ while(m = getmntent(f)) {
-+ if(mnt_dir_expanded = realpath(m->mnt_dir, NULL)) {
-+ if (strcmp(mount_dir_expanded, mnt_dir_expanded)==0) {
-+ free(mnt_dir_expanded);
-+ free(mount_dir_expanded);
-+ return true;
-+ }
- free(mnt_dir_expanded);
-- return true;
-- }
-+ }
- }
-+ free(mount_dir_expanded);
- return false;
- }
-
diff --git a/app-crypt/cryptkeeper/metadata.xml b/app-crypt/cryptkeeper/metadata.xml
deleted file mode 100644
index 848a7fb6da6..00000000000
--- a/app-crypt/cryptkeeper/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>phobosk@fastmail.fm</email>
- <name>PhobosK</name>
- <description>Proxy maintainer. Assign bugs to him.</description>
-</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
-Cryptkeeper is a Linux system tray applet that manages EncFS encrypted folders.
-It allows users to mount and unmount encfs folders, to change the password and
-to create new crypted folders. It integrates with a preferred file manager.
-</longdescription>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 2a2e158263f..c5913482cb5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -388,17 +388,6 @@ games-action/openlierox
dev-libs/safestr
dev-libs/xxl
-# Matthias Maier <tamiko@gentoo.org> (31 Jan 2017)
-# Dead upstream (no development since 2010) [1,2], outstanding security
-# issue with newer encfs versions [3], oustanding Gentoo bugs [4,5].
-# Mask for removal in 30 days.
-# [1] https://github.com/tomm/cryptkeeper/commits/master
-# [2] https://github.com/tomm/cryptkeeper/issues/
-# [3] https://bugs.gentoo.org/show_bug.cgi?id=607772
-# [4] https://bugs.gentoo.org/show_bug.cgi?id=448360
-# [5] https://bugs.gentoo.org/show_bug.cgi?id=596832
-app-crypt/cryptkeeper
-
# Bernard Cafarelli <voyageur@gentoo.org> (30 Jan 2017)
# Alpha release with new features, masked for testing
=app-text/tesseract-4.00.00_alpha*
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-12 21:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-12 21:24 [gentoo-commits] repo/gentoo:master commit in: app-crypt/cryptkeeper/, profiles/, app-crypt/cryptkeeper/files/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox