* [gentoo-commits] repo/gentoo:master commit in: app-editors/dav/, app-editors/dav/files/
@ 2016-08-10 20:01 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2016-08-10 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 1deb31ee68f416d35e90bab9395453dc1850616c
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 19:58:56 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 19:59:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1deb31ee
app-editors/dav: new revision with format-security patch.
Gentoo-Bug: 521016
Package-Manager: portage-2.2.28
app-editors/dav/dav-0.8.5-r2.ebuild | 41 ++++++++++++++++++++++
.../dav/files/fix-Wformat-security-warnings.patch | 39 ++++++++++++++++++++
2 files changed, 80 insertions(+)
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
new file mode 100644
index 0000000..ac71d33
--- /dev/null
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A minimal console text editor"
+HOMEPAGE="http://dav-text.sourceforge.net/"
+
+# The maintainer does not keep sourceforge's mirrors up-to-date,
+# so we point to the website's store of files.
+SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses:0"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-asneeded.patch"
+ "${FILESDIR}/${P}-davrc-buffer-overflow.patch"
+ "${FILESDIR}/fix-Wformat-security-warnings.patch"
+)
+
+# Makefile only
+src_configure() { :; }
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+DOCS=( README )
diff --git a/app-editors/dav/files/fix-Wformat-security-warnings.patch b/app-editors/dav/files/fix-Wformat-security-warnings.patch
new file mode 100644
index 0000000..fe17333
--- /dev/null
+++ b/app-editors/dav/files/fix-Wformat-security-warnings.patch
@@ -0,0 +1,39 @@
+From 8e57c21b3b707c2a81695384688c46faa1d51da8 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 10 Aug 2016 15:52:30 -0400
+Subject: [PATCH 1/1] fileIO.c: add format strings to sprintf calls.
+
+Two calls to sprintf() in fileIO.c were missing the trivial format
+string "%s". This caused warnings with -Wformat-security, and build
+failures with -Werror=format-security. Those two calls are now fixed.
+
+Gentoo-Bug: 521016
+---
+ fileIO.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fileIO.c b/fileIO.c
+index a6c535a..1916a46 100644
+--- a/fileIO.c
++++ b/fileIO.c
+@@ -92,7 +92,7 @@ char *doSave(char *filename) {
+ n++;
+ choices = realloc(choices, n*sizeof(char *));
+ choices[n-1] = malloc(256);
+- sprintf(choices[n-1], d->d_name);
++ sprintf(choices[n-1], "%s", d->d_name);
+ }
+ closedir(dir);
+
+@@ -178,7 +178,7 @@ void load(char *filename)
+ n++;
+ choices = realloc(choices, n*sizeof(char *));
+ choices[n-1] = malloc(256);
+- sprintf(choices[n-1], d->d_name);
++ sprintf(choices[n-1], "%s", d->d_name);
+ }
+ closedir(dir);
+
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/dav/, app-editors/dav/files/
@ 2020-11-01 5:18 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-11-01 5:18 UTC (permalink / raw
To: gentoo-commits
commit: 24e573b450a6498e0fb504a59b1175461fa0151d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 05:17:55 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 05:17:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e573b4
app-editors/dav: fix build with gcc 10, compressed man
Closes: https://bugs.gentoo.org/729246
Closes: https://bugs.gentoo.org/706846
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/dav/dav-0.8.5-r2.ebuild | 19 ++++++++++-------
app-editors/dav/files/dav-0.8.5-asneeded.patch | 5 ++---
.../files/dav-0.8.5-davrc-buffer-overflow.patch | 4 ++--
app-editors/dav/files/dav-0.8.5-fno-common.patch | 24 ++++++++++++++++++++++
app-editors/dav/files/dav-0.8.5-makefile.patch | 21 +++++++++++++++++++
5 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index b04dad5486e..bab3b72d4bd 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="A minimal console text editor"
HOMEPAGE="http://dav-text.sourceforge.net/"
-
# The maintainer does not keep sourceforge's mirrors up-to-date,
# so we point to the website's store of files.
SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
@@ -15,18 +15,20 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+BDEPEND="virtual/pkgconfig"
RDEPEND="sys-libs/ncurses:0="
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-asneeded.patch"
"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
"${FILESDIR}/fix-Wformat-security-warnings.patch"
+ "${FILESDIR}/${PN}-0.8.5-fno-common.patch"
+ "${FILESDIR}/${PN}-0.8.5-makefile.patch"
)
+DOCS=( README )
+
# Makefile only
src_configure() { :; }
@@ -37,4 +39,7 @@ src_compile() {
LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
}
-DOCS=( README )
+src_install() {
+ default
+ docompress -x /usr/share/man/man1/dav.1.gz
+}
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
index 75a43c67f43..92bc6ebfdac 100644
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ b/app-editors/dav/files/dav-0.8.5-asneeded.patch
@@ -1,6 +1,5 @@
-diff -u -r a/Makefile b/Makefile
---- a/Makefile 2004-02-22 02:04:07.000000000 +0100
-+++ b/Makefile 2008-12-30 19:31:19.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -12,7 +12,7 @@
LDFLAGS=-lncurses -O3 -Wall
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
index a32e78ebc81..7287d36cc60 100644
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
@@ -1,5 +1,5 @@
---- dav-0.8.5.orig/main.c 2011-01-29 14:16:53.537725568 -0500
-+++ dav-0.8.5/main.c 2011-01-29 14:20:45.139125094 -0500
+--- a/main.c
++++ b/main.c
@@ -327,7 +327,7 @@
void loadSettings()
{
diff --git a/app-editors/dav/files/dav-0.8.5-fno-common.patch b/app-editors/dav/files/dav-0.8.5-fno-common.patch
new file mode 100644
index 00000000000..df58fa36098
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-fno-common.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/706846
+https://sources.debian.org/patches/dav-text/0.9.0-2/gcc-10.patch/
+--- a/main.c
++++ b/main.c
+@@ -58,7 +58,7 @@ char displayWholeScreen = 0;
+ struct buffer *buffers;
+ struct buffer *currentBuffer;
+ int currentBufferNum = 0;
+-
++ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+
+ int main(int argc, char *argv[])
+ {
+--- dav-text-0.9.0.orig/main.h
++++ dav-text-0.9.0/main.h
+@@ -47,7 +47,7 @@ void connectLines(struct line *baseline)
+ void determineLineNum(struct position *p);
+ void countTabs(struct line *l);
+ void determineCursX(struct position *p);
+-ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
++extern ptrToFunction Fn_ptr[12]; //Bindings for the Fn keys; Fx = Fn_ptr[x-1]
+
+ extern int maxY,maxX;
+ extern int helpBarUpdate;
diff --git a/app-editors/dav/files/dav-0.8.5-makefile.patch b/app-editors/dav/files/dav-0.8.5-makefile.patch
new file mode 100644
index 00000000000..8ff62de305e
--- /dev/null
+++ b/app-editors/dav/files/dav-0.8.5-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 8b1ff0a..7a57840 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ OBJECTS=main.o \
+ buffers.o \
+ fileIO.o \
+@@ -8,8 +8,8 @@ OBJECTS=main.o \
+ undo.o \
+ move.o
+
+-CFLAGS=-O3 -Wall
+-LDFLAGS=-lncurses -O3 -Wall
++CFLAGS?=O3 -Wall
++LDFLAGS?=lncurses -O3 -Wall
+
+ dav: $(OBJECTS)
+ $(CC) $(OBJECTS) $(LDFLAGS) -o dav
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/dav/, app-editors/dav/files/
@ 2025-02-17 10:55 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-02-17 10:55 UTC (permalink / raw
To: gentoo-commits
commit: c51c220d9784c477a45020035956ee3cd8ae0fd9
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 10:26:29 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 10:26:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c51c220d
app-editors/dav: drop 0.8.5-r2
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-editors/dav/Manifest | 1 -
app-editors/dav/dav-0.8.5-r2.ebuild | 45 ----------------------
app-editors/dav/files/dav-0.8.5-asneeded.patch | 11 ------
.../files/dav-0.8.5-davrc-buffer-overflow.patch | 11 ------
app-editors/dav/files/dav-0.8.5-makefile.patch | 21 ----------
.../dav/files/fix-Wformat-security-warnings.patch | 39 -------------------
6 files changed, 128 deletions(-)
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 825981e03a07..1bc3254fe570 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -1,2 +1 @@
-DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
DIST dav-text-0.9.0.tar.gz 23882 BLAKE2B 6845b40bbb74d57438625c2736758c52fbe4cff3e020fd451dee540f06fb893d71e11469f828845c193e9fbbd8a8e0b31dcb9a6fa29383053b61dd9a9d7b0ce4 SHA512 8bb9d111c25e7e41c7d75ee559aeae47494ff68f19f40d2ba3e2ebca23577538b94ba72b58ccf4e64ef92d9e740ee843fa249ef0e4148971b3037259b4f280c5
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
deleted file mode 100644
index 7ca8b35cdd7e..000000000000
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Minimal console text editor"
-HOMEPAGE="https://dav-text.sourceforge.net/"
-# The maintainer does not keep sourceforge's mirrors up-to-date,
-# so we point to the website's store of files.
-SRC_URI="https://dav-text.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-asneeded.patch"
- "${FILESDIR}/${P}-davrc-buffer-overflow.patch"
- "${FILESDIR}/fix-Wformat-security-warnings.patch"
- "${FILESDIR}/${PN}-0.8.5-fno-common.patch"
- "${FILESDIR}/${PN}-0.8.5-makefile.patch"
-)
-
-DOCS=( README )
-
-# Makefile only
-src_configure() { :; }
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
- default
- docompress -x /usr/share/man/man1/dav.1.gz
-}
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
deleted file mode 100644
index 92bc6ebfdacc..000000000000
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@
- LDFLAGS=-lncurses -O3 -Wall
-
- dav: $(OBJECTS)
-- $(CC) $(LDFLAGS) $(OBJECTS) -o dav
-+ $(CC) $(OBJECTS) $(LDFLAGS) -o dav
-
- install:
- mkdir -p $(DESTDIR)/usr/bin
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
deleted file mode 100644
index 7287d36cc604..000000000000
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -327,7 +327,7 @@
- void loadSettings()
- {
- int l;
-- char s[80];
-+ char s[200];
- char home[80];
- char *r;
- char *c;
diff --git a/app-editors/dav/files/dav-0.8.5-makefile.patch b/app-editors/dav/files/dav-0.8.5-makefile.patch
deleted file mode 100644
index 8ff62de305ee..000000000000
--- a/app-editors/dav/files/dav-0.8.5-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8b1ff0a..7a57840 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--CC=gcc
-+CC?=gcc
- OBJECTS=main.o \
- buffers.o \
- fileIO.o \
-@@ -8,8 +8,8 @@ OBJECTS=main.o \
- undo.o \
- move.o
-
--CFLAGS=-O3 -Wall
--LDFLAGS=-lncurses -O3 -Wall
-+CFLAGS?=O3 -Wall
-+LDFLAGS?=lncurses -O3 -Wall
-
- dav: $(OBJECTS)
- $(CC) $(OBJECTS) $(LDFLAGS) -o dav
diff --git a/app-editors/dav/files/fix-Wformat-security-warnings.patch b/app-editors/dav/files/fix-Wformat-security-warnings.patch
deleted file mode 100644
index fe1733360551..000000000000
--- a/app-editors/dav/files/fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e57c21b3b707c2a81695384688c46faa1d51da8 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 10 Aug 2016 15:52:30 -0400
-Subject: [PATCH 1/1] fileIO.c: add format strings to sprintf calls.
-
-Two calls to sprintf() in fileIO.c were missing the trivial format
-string "%s". This caused warnings with -Wformat-security, and build
-failures with -Werror=format-security. Those two calls are now fixed.
-
-Gentoo-Bug: 521016
----
- fileIO.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fileIO.c b/fileIO.c
-index a6c535a..1916a46 100644
---- a/fileIO.c
-+++ b/fileIO.c
-@@ -92,7 +92,7 @@ char *doSave(char *filename) {
- n++;
- choices = realloc(choices, n*sizeof(char *));
- choices[n-1] = malloc(256);
-- sprintf(choices[n-1], d->d_name);
-+ sprintf(choices[n-1], "%s", d->d_name);
- }
- closedir(dir);
-
-@@ -178,7 +178,7 @@ void load(char *filename)
- n++;
- choices = realloc(choices, n*sizeof(char *));
- choices[n-1] = malloc(256);
-- sprintf(choices[n-1], d->d_name);
-+ sprintf(choices[n-1], "%s", d->d_name);
- }
- closedir(dir);
-
---
-2.7.3
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-17 10:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-01 5:18 [gentoo-commits] repo/gentoo:master commit in: app-editors/dav/, app-editors/dav/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-17 10:55 Petr Vaněk
2016-08-10 20:01 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox