[gentoo-commits] repo/gentoo:master commit in: app-editors/ee/files/, app-editors/ee/

[gentoo-commits] repo/gentoo:master commit in: app-editors/ee/files/, app-editors/ee/

[Akinori Hattori]

commit:     9c83c07896d085fd20b320212ba2c3fae4904116
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 09:48:28 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 09:56:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c83c078

app-editors/ee: update patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-editors/ee/ee-1.5.2.ebuild                                    | 2 +-
 .../ee/files/{ee-init-location.diff => ee-init-location.patch}    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index eb45a8bf0cb..16ae483d127 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="!app-editors/ersatz-emacs"
 S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-*.diff
+	epatch "${FILESDIR}"/${PN}-init-location.patch
 
 	sed -i \
 		-e "s/make -/\$(MAKE) -/g" \

diff --git a/app-editors/ee/files/ee-init-location.diff b/app-editors/ee/files/ee-init-location.patch
similarity index 92%
rename from app-editors/ee/files/ee-init-location.diff
rename to app-editors/ee/files/ee-init-location.patch
index 9d6179a03a5..5ac1e47ae96 100644
--- a/app-editors/ee/files/ee-init-location.diff
+++ b/app-editors/ee/files/ee-init-location.patch
@@ -1,5 +1,5 @@
---- easyedit-1.5.2.orig/ee.1
-+++ easyedit-1.5.2/ee.1
+--- a/ee.1
++++ b/ee.1
 @@ -406,7 +406,7 @@
  .PP
  Since different users have different preferences, \fIee\fR allows some 
@@ -27,8 +27,8 @@
  .br
  .I $HOME/.init.ee
  .br
---- easyedit-1.5.2.orig/ee.c
-+++ easyedit-1.5.2/ee.c
+--- a/ee.c
++++ b/ee.c
 @@ -4124,7 +4124,7 @@
  }
  

[gentoo-commits] repo/gentoo:master commit in: app-editors/ee/files/, app-editors/ee/

[Akinori Hattori]

commit:     f810c9a1e1ea2b5dfe545d3d3b044409bb29487f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 09:55:29 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 09:56:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f810c9a1

app-editors/ee: fix build with -Werror=format-security

Gentoo-Bug: 520518

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-editors/ee/ee-1.5.2.ebuild                 |  5 ++++-
 app-editors/ee/files/ee-Wformat-security.patch | 28 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index 250c1e87c8a..0d343a67d9e 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -18,7 +18,10 @@ IUSE=""
 RDEPEND="!app-editors/ersatz-emacs"
 S="${WORKDIR}/easyedit-${PV}"
 
-PATCHES=( "${FILESDIR}"/${PN}-init-location.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-init-location.patch
+	"${FILESDIR}"/${PN}-Wformat-security.patch
+)
 DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
 
 src_prepare() {

diff --git a/app-editors/ee/files/ee-Wformat-security.patch b/app-editors/ee/files/ee-Wformat-security.patch
new file mode 100644
index 00000000000..6db64188347
--- /dev/null
+++ b/app-editors/ee/files/ee-Wformat-security.patch
@@ -0,0 +1,28 @@
+--- a/ee.c
++++ b/ee.c
+@@ -2105,11 +2105,11 @@
+ 		}
+ 		else if (!strcmp("-?", buff))
+ 		{
+-			fprintf(stderr, usage0, arguments[0]);
+-			fprintf(stderr, usage1);
+-			fprintf(stderr, usage2);
+-			fprintf(stderr, usage3);
+-			fprintf(stderr, usage4);
++			fprintf(stderr, "%s", usage0, arguments[0]);
++			fprintf(stderr, "%s", usage1);
++			fprintf(stderr, "%s", usage2);
++			fprintf(stderr, "%s", usage3);
++			fprintf(stderr, "%s", usage4);
+ 			exit(1);
+ 		}
+ 		else if ((*buff == '+') && (start_at_line == NULL))
+@@ -3243,7 +3243,7 @@
+ 	}
+ 	if (shell_fork)
+ 	{
+-		printf(continue_msg);
++		printf("%s", continue_msg);
+ 		fflush(stdout);
+ 		while ((in = getchar()) != '\n')
+ 			;