* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/
@ 2019-11-06 6:23 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2019-11-06 6:23 UTC (permalink / raw
To: gentoo-commits
commit: cb8d3b90e28402c3c172209c57c1b787899791ed
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Wed Oct 23 18:48:35 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 6 06:23:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb8d3b90
net-dialup/lrzsz: fix compilation with gettext-0.20
Thanks to Felix J. Ogris for the patch!
Closes: https://bugs.gentoo.org/685696
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/13400
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch | 23 ++++++++++++++++++++++
net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild | 9 ++++++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch
new file mode 100644
index 00000000000..3c58bd18091
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch
@@ -0,0 +1,23 @@
+diff -udr a/configure.in b/configure.in
+--- a/configure.in 1998-12-30 08:50:07.000000000 +0100
++++ b/configure.in 2019-06-01 20:38:54.918650170 +0200
+@@ -1,3 +1,4 @@
++m4_pattern_allow(.*)
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/crctab.c)
+ AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+diff -udr lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
+--- a/po/Makefile.in.in 1998-04-26 15:22:40.000000000 +0200
++++ b/po/Makefile.in.in 2019-06-01 20:48:09.020703542 +0200
+@@ -110,9 +110,9 @@
+ install-data-no: all
+ install-data-yes: all
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(datadir); \
++ $(MKINSTALLDIRS) $(DATADIR); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(datadir); \
++ $(top_srcdir)/mkinstalldirs $(DATADIR); \
+ fi
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index c89d4506098..e41f957e5b6 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,10 +16,13 @@ IUSE="nls"
DEPEND="nls? ( virtual/libintl )"
-PATCHES=( "${FILESDIR}"/${PN}-autotools.patch
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
"${FILESDIR}"/${PN}-implicit-decl.patch
"${FILESDIR}"/${P}-automake-1.12.patch
- "${FILESDIR}"/${P}-automake-1.13.patch )
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+)
DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/
@ 2020-06-12 7:31 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-06-12 7:31 UTC (permalink / raw
To: gentoo-commits
commit: 08ca8128c48c95cd4024fe0eed37fd797af25899
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 07:28:30 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 07:31:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ca8128
net-dialup/lrzsz: respect user's AR
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/721032
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch | 10 ++++++++++
net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch
new file mode 100644
index 00000000000..fd923d5374a
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -95,6 +95,7 @@ AC_PROG_GCC_TRADITIONAL
+ dnl AC_PROG_INSTALL included in AM_INIT_AUTOMAKE
+ dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ AM_GNU_GETTEXT
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index b69e339df6f..3657ff1bc3a 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-1.12.patch
"${FILESDIR}"/${P}-automake-1.13.patch
"${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
)
DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/
@ 2023-12-19 11:22 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-12-19 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 48da0cfd62e04219063d7dab7cb9e2df7829761d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:17:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:17:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48da0cfd
net-dialup/lrzsz: fix modern C issue
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch | 27 ++++++++++
net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild | 75 ++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch
new file mode 100644
index 000000000000..db593179b02e
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch
@@ -0,0 +1,27 @@
+https://src.fedoraproject.org/rpms/lrzsz/blob/c23247c9c7604aec31d49ed1b238622835f575e2/f/lrzsz-socklen.patch
+
+Use socklen_t as the length of the socket address (which is a bit of
+an anachronism, considering the rest of the sources). The previous
+code des not work on 64-bit big-endian architectures.
+
+--- a/src/tcp.c
++++ b/src/tcp.c
+@@ -56,7 +56,7 @@ tcp_server (char *buf)
+ struct sockaddr_in s;
+ struct sockaddr_in t;
+ int on=1;
+- size_t len;
++ socklen_t len;
+
+ if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+ error(1,errno,"socket");
+@@ -91,7 +91,7 @@ tcp_accept (int d)
+ {
+ int so;
+ struct sockaddr_in s;
+- size_t namelen;
++ socklen_t namelen;
+ int num=0;
+
+ namelen = sizeof(s);
+
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild
new file mode 100644
index 000000000000..0e842edb2981
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="
+ https://www.ohse.de/uwe/releases/${P}.tar.gz
+ https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
+ "${FILESDIR}"/${PN}-implicit-decl.patch
+ "${FILESDIR}"/${P}-automake-1.12.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-gettext-0.22.patch
+ "${FILESDIR}"/${P}-disable-nls.patch
+ "${FILESDIR}"/${P}-c99.patch
+)
+
+DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
+ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
+
+src_prepare() {
+ default
+
+ # automake is unhappy if this is missing
+ >> config.rpath || die
+ # This is too old. Remove it so automake puts in a newer copy.
+ rm missing || die
+ # Autoheader does not like seeing this file.
+ rm acconfig.h || die
+ # embed default m4 files in case gettext is not installed
+ mv "${WORKDIR}"/m4 . || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+
+ econf $(use_enable nls)
+}
+
+src_test() {
+ # Don't use check target.
+ # See bug #120748 before changing this function.
+ emake vcheck
+}
+
+src_install() {
+ default
+
+ local x
+ for x in {r,s}{b,x,z} ; do
+ dosym l${x} /usr/bin/${x}
+ dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+ [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+ done
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/
@ 2024-08-03 6:02 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2024-08-03 6:02 UTC (permalink / raw
To: gentoo-commits
commit: 9d72a7601ef530f753d2fa7d6ad7c0d3dddb1f93
Author: Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Fri Aug 2 15:42:39 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 06:02:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d72a760
net-dialup/lrzsz: Fix information leak
- Patch taken from Fedora (check patch file for link)
- Seems to still be affected by https://bugs.gentoo.org/836585
- Tests pass otherwise ("All tests OK.")
Bug: https://bugs.gentoo.org/797247
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/37927
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../files/lrzsz-0.12.20-fix-integer-overflow.patch | 23 +++++++
net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild | 76 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch
new file mode 100644
index 000000000000..771b67dda473
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch
@@ -0,0 +1,23 @@
+https://src.fedoraproject.org/rpms/lrzsz/blob/rawhide/f/lrzsz-0.12.20.patch
+https://bugs.gentoo.org/797247
+
+diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c
+--- lrzsz-0.12.20/src/zm.c Tue Dec 29 09:48:38 1998
++++ lrzsz-0.12.20.new/src/zm.c Tue Oct 8 12:46:58 2002
+@@ -431,10 +431,12 @@
+ VPRINTF(3,("zsdata: %lu %s", (unsigned long) length,
+ Zendnames[(frameend-ZCRCE)&3]));
+ crc = 0;
+- do {
+- zsendline(*buf); crc = updcrc((0377 & *buf), crc);
+- buf++;
+- } while (--length>0);
++
++ for( ; length; length--) {
++ zsendline(*buf); crc = updcrc((0377 & *buf), crc);
++ buf++;
++ }
++
+ xsendline(ZDLE); xsendline(frameend);
+ crc = updcrc(frameend, crc);
+
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
new file mode 100644
index 000000000000..f84469571721
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="
+ https://www.ohse.de/uwe/releases/${P}.tar.gz
+ https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
+ "${FILESDIR}"/${PN}-implicit-decl.patch
+ "${FILESDIR}"/${P}-automake-1.12.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-gettext-0.22.patch
+ "${FILESDIR}"/${P}-disable-nls.patch
+ "${FILESDIR}"/${P}-c99.patch
+ "${FILESDIR}"/${P}-fix-integer-overflow.patch
+)
+
+DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
+ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
+
+src_prepare() {
+ default
+
+ # automake is unhappy if this is missing
+ >> config.rpath || die
+ # This is too old. Remove it so automake puts in a newer copy.
+ rm missing || die
+ # Autoheader does not like seeing this file.
+ rm acconfig.h || die
+ # embed default m4 files in case gettext is not installed
+ mv "${WORKDIR}"/m4 . || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+
+ econf $(use_enable nls)
+}
+
+src_test() {
+ # Don't use check target.
+ # See bug #120748 before changing this function.
+ emake vcheck
+}
+
+src_install() {
+ default
+
+ local x
+ for x in {r,s}{b,x,z} ; do
+ dosym l${x} /usr/bin/${x}
+ dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+ [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+ done
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-03 6:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-03 6:02 [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/, net-dialup/lrzsz/files/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 11:22 Sam James
2020-06-12 7:31 Sergei Trofimovich
2019-11-06 6:23 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox