Sync from SUSE:SLFO:Main rzsz revision d612a5d9863ef1a57f407b10c90a834f
This commit is contained in:
commit
62ae63b4e9
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
28
lrzsz-0.12.20-automake-1.12.patch
Normal file
28
lrzsz-0.12.20-automake-1.12.patch
Normal file
@ -0,0 +1,28 @@
|
||||
--- lrzsz-0.12.20/configure.in
|
||||
+++ lrzsz-0.12.20/configure.in
|
||||
@@ -97,7 +97,6 @@
|
||||
AC_ISC_POSIX
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AM_GNU_GETTEXT
|
||||
-AM_C_PROTOTYPES
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
--- lrzsz-0.12.20/lib/Makefile.am
|
||||
+++ lrzsz-0.12.20/lib/Makefile.am
|
||||
@@ -1,5 +1,4 @@
|
||||
noinst_LIBRARIES=libzmodem.a
|
||||
-AUTOMAKE_OPTIONS=ansi2knr
|
||||
|
||||
EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
|
||||
getopt.c getopt1.c mkdir.c mktime.c \
|
||||
--- lrzsz-0.12.20/src/Makefile.am
|
||||
+++ lrzsz-0.12.20/src/Makefile.am
|
||||
@@ -7,7 +7,6 @@
|
||||
DISTCLEAN_FILES=lrzszbug
|
||||
|
||||
LDADD = ../lib/libzmodem.a @INTLLIBS@
|
||||
-AUTOMAKE_OPTIONS=ansi2knr
|
||||
EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
|
||||
INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
|
||||
#DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
|
||||
13
lrzsz-0.12.20-automake-1.13.patch
Normal file
13
lrzsz-0.12.20-automake-1.13.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: lrzsz-0.12.21rc/configure.in
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/configure.in
|
||||
+++ lrzsz-0.12.21rc/configure.in
|
||||
@@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(src/crctab.c)
|
||||
AM_INIT_AUTOMAKE(lrzsz, 0.12.21rc)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
|
||||
dnl AC_C_CROSS is in AC_PROG_CC since 2.12
|
||||
11
lrzsz-0.12.20-fix-lsz-getopt.patch
Normal file
11
lrzsz-0.12.20-fix-lsz-getopt.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- lrzsz-0.12.20.orig/src/lsz.c
|
||||
+++ lrzsz-0.12.20/src/lsz.c
|
||||
@@ -349,7 +349,7 @@ main(int argc, char **argv)
|
||||
Rxtimeout = 600;
|
||||
|
||||
while ((c = getopt_long (argc, argv,
|
||||
- "2+48abB:C:c:dfeEghHi:kL:l:m:M:NnOopRrqsSt:TUuvw:XYy",
|
||||
+ "2+48abB:C:c:dfeEghHi:kL:l:m:M:NnOopRrqs:St:TUuvw:XYy",
|
||||
long_options, (int *) 0))!=EOF)
|
||||
{
|
||||
unsigned long int tmp;
|
||||
12
lrzsz-0.12.20-null-pointer.patch
Normal file
12
lrzsz-0.12.20-null-pointer.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -urN lrzsz-0.12.20/src/lrz.c lrzsz-0.12.20.new/src/lrz.c
|
||||
--- lrzsz-0.12.20/src/lrz.c 1998-12-30 08:49:24.000000000 +0100
|
||||
+++ lrzsz-0.12.20.new/src/lrz.c 2014-05-12 16:50:38.212549624 +0200
|
||||
@@ -2319,7 +2319,7 @@
|
||||
if (*s == '!')
|
||||
++s;
|
||||
io_mode(0,0);
|
||||
- execl("/bin/sh", "sh", "-c", s);
|
||||
+ execl("/bin/sh", "sh", "-c", s, NULL);
|
||||
zpfatal("execl");
|
||||
exit(1);
|
||||
}
|
||||
18
lrzsz-0.12.20-use-after-free.patch
Normal file
18
lrzsz-0.12.20-use-after-free.patch
Normal file
@ -0,0 +1,18 @@
|
||||
---
|
||||
src/lsz.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- lrzsz-0.12.20.orig/src/lsz.c
|
||||
+++ lrzsz-0.12.20/src/lsz.c
|
||||
@@ -839,10 +839,10 @@ send_pseudo(const char *name, const char
|
||||
lfd=0;
|
||||
do {
|
||||
if (lfd++==10) {
|
||||
- free(tmp);
|
||||
vstringf (_ ("send_pseudo %s: cannot open tmpfile %s: %s"),
|
||||
name, tmp, strerror (errno));
|
||||
vstring ("\r\n");
|
||||
+ free(tmp);
|
||||
return 1;
|
||||
}
|
||||
sprintf(tmp+plen,"%s.%lu.%d",name,(unsigned long) getpid(),lfd);
|
||||
30
lrzsz-0.12.21rc-drop-po-intl.patch
Normal file
30
lrzsz-0.12.21rc-drop-po-intl.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS = lib intl src po man testsuite
|
||||
+SUBDIRS = lib src man testsuite
|
||||
EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
|
||||
README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \
|
||||
beos-runpiped.c fastcheck.beos
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -92,7 +92,7 @@ USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
l = @l@
|
||||
|
||||
-SUBDIRS = lib intl src po man testsuite
|
||||
+SUBDIRS = lib src man testsuite
|
||||
EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests beos-runpiped.c fastcheck.beos
|
||||
|
||||
noinst_SCRIPTS = systype
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -107,7 +107,7 @@ dnl AC_PROG_MAKE_SET included in AM_INIT
|
||||
AC_PROG_RANLIB
|
||||
AC_ISC_POSIX
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
-AM_GNU_GETTEXT
|
||||
+AM_GNU_GETTEXT([external])
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
BIN
lrzsz-0.12.21rc.tar.gz
(Stored with Git LFS)
Normal file
BIN
lrzsz-0.12.21rc.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
287
lrzsz-autotools.patch
Normal file
287
lrzsz-autotools.patch
Normal file
@ -0,0 +1,287 @@
|
||||
Index: lrzsz-0.12.21rc/acinclude.m4
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/acinclude.m4
|
||||
+++ lrzsz-0.12.21rc/acinclude.m4
|
||||
@@ -13,7 +13,7 @@ AC_CACHE_VAL(lrzsz_cv_decl_errno,
|
||||
lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)])
|
||||
AC_MSG_RESULT($lrzsz_cv_decl_errno)
|
||||
if test $lrzsz_cv_decl_errno = yes; then
|
||||
- AC_DEFINE([HAVE_ERRNO_DECLARATION])
|
||||
+ AC_DEFINE([HAVE_ERRNO_DECLARATION], 1, [[HAVE_ERRNO_DECLARATION]])
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -57,7 +57,7 @@ AC_CACHE_VAL(ac_cv_type_speed_t,
|
||||
], ac_cv_type_speed_t=yes, ac_cv_type_speed_t=no)])dnl
|
||||
AC_MSG_RESULT($ac_cv_type_speed_t)
|
||||
if test $ac_cv_type_speed_t = no; then
|
||||
- AC_DEFINE([speed_t],long)
|
||||
+ AC_DEFINE([speed_t],long, [speed_t])
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -69,7 +69,7 @@ AC_DEFUN(lrzsz_HEADER_SYS_SELECT,
|
||||
#include <sys/select.h>],
|
||||
[struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)])
|
||||
if test $lrzsz_cv_header_sys_select = no; then
|
||||
- AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT)
|
||||
+ AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT, 1, [SYS_TIME_WITHOUT_SYS_SELECT])
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -90,6 +90,6 @@ if test $ac_cv_type_socklen_t = no; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define socklen_t int
|
||||
EOF
|
||||
- AC_DEFINE([socklen_t],int)
|
||||
+ AC_DEFINE([socklen_t],int, [socklen_t])
|
||||
fi
|
||||
]) dnl DEFUN
|
||||
Index: lrzsz-0.12.21rc/configure.in
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/configure.in
|
||||
+++ lrzsz-0.12.21rc/configure.in
|
||||
@@ -20,6 +20,11 @@ ALL_LINGUAS="de"
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
+GT_YES="#"
|
||||
+GT_NO=""
|
||||
+AC_SUBST(GT_YES)
|
||||
+AC_SUBST(GT_NO)
|
||||
+
|
||||
changequote(,)dnl
|
||||
case $VERSION in
|
||||
[0-9]*.[0-9]*.[0-9]*) README_ALPHA="README-alpha";;
|
||||
@@ -33,25 +38,25 @@ AC_ARG_ENABLE(timesync,
|
||||
[if test "$enableval" = "no" ; then
|
||||
:
|
||||
else
|
||||
- AC_DEFINE(ENABLE_TIMESYNC)
|
||||
+ AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])
|
||||
fi],
|
||||
- [AC_DEFINE(ENABLE_TIMESYNC)])
|
||||
+ [AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])])
|
||||
AC_SUBST(ENABLE_TIMESYNC)
|
||||
AC_ARG_ENABLE(pubdir,
|
||||
[--enable-pubdir=/path include support for a public writeable directory],
|
||||
[if test "$enableval" = "no" ; then
|
||||
:
|
||||
else
|
||||
- AC_DEFINE_UNQUOTED(PUBDIR,"$enableval")
|
||||
+ AC_DEFINE_UNQUOTED(PUBDIR,"$enableval", [PUBDIR])
|
||||
fi])
|
||||
AC_ARG_ENABLE(mkdir,
|
||||
[--disable-mkdir disable support for creating directories (lrz)],
|
||||
[if test "$enableval" = "no" ; then
|
||||
:
|
||||
else
|
||||
- AC_DEFINE(ENABLE_MKDIR)
|
||||
+ AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])
|
||||
fi],
|
||||
- [AC_DEFINE(ENABLE_MKDIR)])
|
||||
+ [AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])])
|
||||
AC_ARG_ENABLE(syslog,
|
||||
[--enable-syslog=FACILITY,{force,default,optional} include syslogsupport],
|
||||
[
|
||||
@@ -62,7 +67,7 @@ AC_ARG_ENABLE(syslog,
|
||||
*,*)
|
||||
level=`echo $enableval|sed -e 's/^.*,//'`
|
||||
fac=`echo $enableval|sed -e 's/,.*$//'`
|
||||
- AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac)
|
||||
+ AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac, [ENABLE_SYSLOG])
|
||||
;;
|
||||
*)
|
||||
lookup_facility=LOG_UUCP
|
||||
@@ -70,16 +75,16 @@ AC_ARG_ENABLE(syslog,
|
||||
;;
|
||||
esac
|
||||
if test "$level" = "force" ; then
|
||||
- AC_DEFINE(ENABLE_SYSLOG_FORCE)
|
||||
+ AC_DEFINE(ENABLE_SYSLOG_FORCE, 1, [ENABLE_SYSLOG_FORCE])
|
||||
else
|
||||
if test "$level" = "optional" ; then
|
||||
:
|
||||
else
|
||||
- AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
|
||||
+ AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
|
||||
fi
|
||||
fi
|
||||
fi],[
|
||||
- AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
|
||||
+ AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
|
||||
lookup_facility=LOG_UUCP
|
||||
])
|
||||
|
||||
@@ -101,8 +106,8 @@ dnl AC_PROG_INSTALL included in AM_INIT
|
||||
dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
|
||||
AC_PROG_RANLIB
|
||||
AC_ISC_POSIX
|
||||
-AC_AIX
|
||||
-AC_MINIX
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+AM_GNU_GETTEXT
|
||||
AM_C_PROTOTYPES
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
@@ -124,7 +129,7 @@ if test `hostname` = tirka.ohse.de -a "$
|
||||
fi
|
||||
case "$CFLAGS" in
|
||||
*-Wstrict-prototypes*)
|
||||
- AC_DEFINE(STRICT_PROTOTYPES)
|
||||
+ AC_DEFINE(STRICT_PROTOTYPES, 1, [STRICT_PROTOTYPES])
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -142,7 +147,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/io
|
||||
LRZSZ_HEADERS_TERM_IO
|
||||
AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
|
||||
AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
|
||||
-AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h)
|
||||
+AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_TYPE_SIZE_T
|
||||
@@ -165,7 +170,8 @@ dnl suggested by autoscan, but not reall
|
||||
dnl AC_FUNC_UTIME_NULL
|
||||
AC_FUNC_MMAP
|
||||
AC_FUNC_ALLOCA
|
||||
-AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF))
|
||||
+AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [HAVE_STRUCT_UTIMBUF]))
|
||||
+
|
||||
|
||||
AC_CHECK_FUNCS(gettimeofday settimeofday)
|
||||
AC_CHECK_FUNCS(strchr memcpy select vprintf)
|
||||
@@ -176,7 +182,7 @@ AC_REPLACE_FUNCS(stpcpy strftime vasprin
|
||||
AC_REPLACE_GNU_GETOPT
|
||||
|
||||
dnl for lib/error.c
|
||||
-AC_DEFINE(HAVE_STRERROR)
|
||||
+AC_DEFINE(HAVE_STRERROR, 1, HAVE_STRERROR)
|
||||
|
||||
|
||||
dnl special tests
|
||||
@@ -218,10 +224,10 @@ lrzsz_cv_sys_ftime_ok=yes,
|
||||
lrzsz_cv_sys_ftime_ok=no,
|
||||
lrzsz_cv_sys_ftime_ok=runtime)])
|
||||
case $lrzsz_cv_sys_ftime_ok in
|
||||
-yes) AC_DEFINE(HAVE_FTIME) AC_MSG_RESULT(yes) ;;
|
||||
+yes) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME]) AC_MSG_RESULT(yes) ;;
|
||||
no) AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN(ftime seems to be buggy) ;;
|
||||
-runtime) AC_DEFINE(HAVE_FTIME)
|
||||
+runtime) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME])
|
||||
AC_MSG_RESULT(will check at run time) ;;
|
||||
esac
|
||||
])
|
||||
@@ -235,7 +241,7 @@ AC_TRY_LINK([#include <time.h>],[return(
|
||||
])
|
||||
if test $libquark_cv_var_timezone = yes ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE(HAVE_TIMEZONE_VAR)
|
||||
+ AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [HAVE_TIMEZONE_VAR])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
@@ -257,9 +263,9 @@ ihave$lookup_facility
|
||||
])
|
||||
if test $lrzsz_cv_lookup_facility = yes ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility)
|
||||
+ AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility, [ENABLE_SYSLOG])
|
||||
else
|
||||
- AC_DEFINE(ENABLE_SYSLOG,LOG_USER)
|
||||
+ AC_DEFINE(ENABLE_SYSLOG,LOG_USER, [ENABLE_SYSLOG])
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
@@ -269,9 +275,7 @@ AC_SUBST(CFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
-AM_GNU_GETTEXT
|
||||
-
|
||||
-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
|
||||
+AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
|
||||
dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
|
||||
|
||||
AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
|
||||
Index: lrzsz-0.12.21rc/lib/Makefile.am
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/lib/Makefile.am
|
||||
+++ lrzsz-0.12.21rc/lib/Makefile.am
|
||||
@@ -1,5 +1,4 @@
|
||||
noinst_LIBRARIES=libzmodem.a
|
||||
-CFLAGS=@CFLAGS@
|
||||
AUTOMAKE_OPTIONS=ansi2knr
|
||||
|
||||
EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
|
||||
Index: lrzsz-0.12.21rc/po/Makefile.in.in
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/po/Makefile.in.in
|
||||
+++ lrzsz-0.12.21rc/po/Makefile.in.in
|
||||
@@ -51,7 +51,7 @@ stamp-cat-id $(POFILES) $(GMOFILES) $(SO
|
||||
|
||||
POTFILES = \
|
||||
|
||||
-CATALOGS = @CATALOGS@
|
||||
+CATALOGS = de.gmo
|
||||
CATOBJEXT = @CATOBJEXT@
|
||||
INSTOBJEXT = @INSTOBJEXT@
|
||||
|
||||
@@ -118,8 +118,8 @@ install-data-yes: all
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
case "$$cat" in \
|
||||
- *.gmo) destdir=$(gnulocaledir);; \
|
||||
- *) destdir=$(localedir);; \
|
||||
+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
|
||||
+ *) destdir=$(DESTDIR)$(localedir);; \
|
||||
esac; \
|
||||
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
||||
dir=$$destdir/$$lang/LC_MESSAGES; \
|
||||
Index: lrzsz-0.12.21rc/src/Makefile.am
|
||||
===================================================================
|
||||
--- lrzsz-0.12.21rc.orig/src/Makefile.am
|
||||
+++ lrzsz-0.12.21rc/src/Makefile.am
|
||||
@@ -4,7 +4,6 @@ lsz_SOURCES=lsz.c timing.c zperr.c zread
|
||||
noinst_HEADERS = timing.h zglobal.h zmodem.h
|
||||
datadir = $(prefix)/@DATADIRNAME@
|
||||
localedir = $(datadir)/locale
|
||||
-CFLAGS=@CFLAGS@
|
||||
DISTCLEAN_FILES=lrzszbug
|
||||
|
||||
LDADD = ../lib/libzmodem.a @INTLLIBS@
|
||||
@@ -14,22 +13,16 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcd
|
||||
#DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
|
||||
DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
|
||||
|
||||
-install-exec-local:
|
||||
- rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
|
||||
- ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
|
||||
- $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'`
|
||||
- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
|
||||
- ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
|
||||
- $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'`
|
||||
- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
|
||||
- ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
|
||||
- $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'`
|
||||
- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
|
||||
- ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
|
||||
- $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'`
|
||||
-# rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
|
||||
-# ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
|
||||
-# $(bindir)/`echo lrzszbug |sed -e '$(transform)'`
|
||||
+# Caveat: program name transformation is ignored here.
|
||||
+$(DESTDIR)$(bindir)/lsz $(DESTDIR)$(bindir)/lrz: install-binPROGRAMS
|
||||
+
|
||||
+$(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx: $(DESTDIR)$(bindir)/lsz
|
||||
+ rm -f $@ ; ln -s `basename $<` $@
|
||||
+
|
||||
+$(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx: $(DESTDIR)$(bindir)/lrz
|
||||
+ rm -f $@ ; ln -s `basename $<` $@
|
||||
+
|
||||
+install-exec-local: $(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx $(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'`
|
||||
23
lrzsz-implicit-decl.patch
Normal file
23
lrzsz-implicit-decl.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- lrzsz-0.12.20/lib/long-options.c
|
||||
+++ lrzsz-0.12.20/lib/long-options.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <getopt.h>
|
||||
#include "long-options.h"
|
||||
|
||||
--- lrzsz-0.12.20/src/lsyslog.c
|
||||
+++ lrzsz-0.12.20/src/lsyslog.c
|
||||
@@ -20,8 +20,10 @@
|
||||
*/
|
||||
#include "config.h"
|
||||
#ifdef ENABLE_SYSLOG
|
||||
+#define _GNU_SOURCE
|
||||
#include "zglobal.h"
|
||||
#include <pwd.h>
|
||||
+#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
13
lrzsz-po.patch
Normal file
13
lrzsz-po.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: po/de.po
|
||||
===================================================================
|
||||
--- po/de.po.orig
|
||||
+++ po/de.po
|
||||
@@ -254,7 +254,7 @@ msgstr "Keine Bestätigung für Übertragun
|
||||
#: src/lsz.c:1361
|
||||
#, c-format
|
||||
msgid "Xmodem sectors/kbytes sent: %3d/%2dk"
|
||||
-msgstr "Ymodem Sektoren/Kilobytes gesendet: %3d/%2dk"
|
||||
+msgstr "Xmodem Sektoren/Kilobytes gesendet: %3d/%2dk"
|
||||
|
||||
#: src/lsz.c:1363
|
||||
#, c-format
|
||||
172
rzsz.changes
Normal file
172
rzsz.changes
Normal file
@ -0,0 +1,172 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 9 20:10:36 UTC 2019 - Benoît Monin <benoit.monin@gmx.fr>
|
||||
|
||||
- add lrzsz-0.12.21rc-drop-po-intl.patch (bsc#1181571):
|
||||
fix build with gettext >= 0.20
|
||||
- generate and install translation file manually
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 5 07:51:03 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Update to 0.12.21~rc bsc#1086416 bsc#1090051 CVE-2018-10195:
|
||||
* RC candidate from 1999 containing bunch of trivial fxies that
|
||||
most other distributions ship
|
||||
- Rebase patches:
|
||||
* lrzsz-0.12.20-automake-1.13.patch
|
||||
* lrzsz-autotools.patch
|
||||
* lrzsz-po.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 21 13:35:25 UTC 2018 - benoit.monin@gmx.fr
|
||||
|
||||
- add lrzsz-0.12.20-fix-lsz-getopt.patch: fix for boo#1076576
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 18 12:42:46 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 3 18:57:20 UTC 2017 - benoit.monin@gmx.fr
|
||||
|
||||
- remove _link to factory to build the package in the devel project
|
||||
- change source to tar.gz: upstream does not provide tar.bz2
|
||||
- also ignore ZMODEMtcp* tests failure for s390x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 14 12:40:11 UTC 2016 - normand@linux.vnet.ibm.com
|
||||
|
||||
- ignore ZMODEMtcp* tests failure for ppc64 archi
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 4 15:31:38 CEST 2014 - ro@suse.de
|
||||
|
||||
- re-diff lrzsz-implicit-decl.patch
|
||||
- Drop unused drop_ftime.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 12 14:52:21 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Cleanup with spec-cleaner
|
||||
- Apply autoconf patches to allow autoreconf:
|
||||
* lrzsz-autotools.patch
|
||||
* lrzsz-0.12.20-automake-1.12.patch
|
||||
* lrzsz-0.12.20-automake-1.13.patch
|
||||
- Fix compilation with latest gccs:
|
||||
* lrzsz-implicit-decl.patch
|
||||
- Fix null as last argument for function calls:
|
||||
* lrzsz-0.12.20-null-pointer.patch
|
||||
- Remove weirdly done patch that merged multiple operations at once:
|
||||
* lrzsz-0.12.20.dif
|
||||
- Run test phase
|
||||
- Run make install properly and create symlinks for the
|
||||
other binaries to provide lrz* to r* symlinks and thus match other
|
||||
distributions.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 20:30:02 UTC 2013 - dvaleev@suse.com
|
||||
|
||||
- Drop obsoleted ftime. (drop_ftime.patch)
|
||||
Broken under PowerKVM
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 30 16:12:50 UTC 2011 - uli@suse.com
|
||||
|
||||
- cross-build fixes: use %configure macro, install to correct bindir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 7 15:30:10 CEST 2009 - mmarek@suse.cz
|
||||
|
||||
- lrzsz-0.12.20-use-after-free.patch: fix for bnc#529899.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 25 15:11:21 CET 2008 - crrodriguez@suse.de
|
||||
|
||||
- use find_lang macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:41:18 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 17 14:48:14 CEST 2005 - meissner@suse.de
|
||||
|
||||
- use RPM_OPT_FLAGS.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 24 17:12:56 CET 2005 - meissner@suse.de
|
||||
|
||||
- fixed some implicit warnings, fixed one execle.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 11 12:02:06 CET 2004 - adrian@suse.de
|
||||
|
||||
- add %defattr
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 22 10:02:21 CEST 2002 - nadvornik@suse.cz
|
||||
|
||||
- installed /usr/bin/sx again (sx from package sp was renamed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 22 10:59:11 CET 2001 - nadvornik@suse.cz
|
||||
|
||||
- fixed typo in german po file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 9 09:37:19 CEST 2000 - nadvornik@suse.cz
|
||||
|
||||
- fixed Copyright
|
||||
- used bzip2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 20 14:09:54 CEST 2000 - nadvornik@suse.cz
|
||||
|
||||
- added BuildRoot
|
||||
- added URL
|
||||
- removed Makefile.Linux
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 2 22:11:20 CET 2000 - zoz@suse.de
|
||||
|
||||
- /usr/man -> /usr/share/man
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 1 17:07:44 CEST 1999 - zoz@suse.de
|
||||
|
||||
- manpage sx removed, added remark to man sz
|
||||
- added README.SuSE with same remark
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
|
||||
|
||||
- ran old prepare_spec on spec file to switch to new prepare_spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 1 11:24:42 MET 1999 - ro@suse.de
|
||||
|
||||
- don't redeclare strstr if already defined as a macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 20 15:28:26 MET 1999 - bs@suse.de
|
||||
|
||||
- removed /usr/bin/sx from file list (is in package sp)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 19 13:17:27 MET 1999 - florian@suse.de
|
||||
|
||||
- update to lrzsz 0.12.20
|
||||
- fixed list of files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 27 18:18:36 MEST 1998 - ro@suse.de
|
||||
|
||||
- define DST_NONE if undefined
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 23 13:37:48 MEST 1997 - ro@suse.de
|
||||
|
||||
- ready for autobuild
|
||||
|
||||
update to new version lrzsz 0.12b
|
||||
114
rzsz.spec
Normal file
114
rzsz.spec
Normal file
@ -0,0 +1,114 @@
|
||||
#
|
||||
# spec file for package rzsz
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define realver 0.12.21rc
|
||||
Name: rzsz
|
||||
Version: 0.12.21~rc
|
||||
Release: 0
|
||||
Summary: X-, Y-, and Z-Modem Data Transfer Protocols
|
||||
License: GPL-2.0-or-later
|
||||
Group: Hardware/Modem
|
||||
URL: http://www.ohse.de/uwe/software/lrzsz.html
|
||||
Source: http://www.ohse.de/uwe/testing/lrzsz-%{realver}.tar.gz
|
||||
Patch1: lrzsz-po.patch
|
||||
Patch2: lrzsz-0.12.20-use-after-free.patch
|
||||
Patch4: lrzsz-autotools.patch
|
||||
Patch5: lrzsz-implicit-decl.patch
|
||||
Patch6: lrzsz-0.12.20-automake-1.12.patch
|
||||
Patch7: lrzsz-0.12.20-automake-1.13.patch
|
||||
Patch8: lrzsz-0.12.20-null-pointer.patch
|
||||
# PATCH-FIX-UPSTREAM fix getopt optstring boo#1076576
|
||||
Patch9: lrzsz-0.12.20-fix-lsz-getopt.patch
|
||||
Patch10: lrzsz-0.12.21rc-drop-po-intl.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
Provides: lrzsz
|
||||
|
||||
%description
|
||||
rzsz allows you to use "sz filename" to send a file to your local
|
||||
system.
|
||||
|
||||
%prep
|
||||
%setup -q -n lrzsz-%{realver}
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
# Missing file
|
||||
>> config.rpath
|
||||
# Too old
|
||||
rm -f missing
|
||||
# Broken header
|
||||
rm -f acconfig.h
|
||||
|
||||
%build
|
||||
autoreconf -fvi
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
# generate translation
|
||||
msgfmt -o po/de.mo po/de.po
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
# install translation
|
||||
mkdir -p "%{buildroot}/%{_datarootdir}/locale/de/LC_MESSAGES"
|
||||
cp po/de.mo "%{buildroot}/%{_datarootdir}/locale/de/LC_MESSAGES/lrzsz.mo"
|
||||
%find_lang lrzsz
|
||||
|
||||
# Fix various symlinks
|
||||
for x in {r,s}{b,x,z} ; do
|
||||
pushd "%{buildroot}/%{_bindir}"
|
||||
ln -s l$x $x
|
||||
popd
|
||||
pushd "%{buildroot}/%{_mandir}/man1"
|
||||
ln -s l${x:0:1}z.1 ${x}.1
|
||||
popd
|
||||
done
|
||||
|
||||
%check
|
||||
%ifarch ppc64 s390x
|
||||
make vcheck -j1 || echo "Warning: ignore ZMODEMtcp* tests failure for %{_arch}";
|
||||
%else
|
||||
make vcheck -j1
|
||||
%endif
|
||||
|
||||
%files -f lrzsz.lang
|
||||
%{_mandir}/man1/*
|
||||
%license COPYING
|
||||
%doc README.* ABOUT-NLS AUTHORS COMPATABILITY ChangeLog NEWS THANKS TODO
|
||||
%{_bindir}/rb
|
||||
%{_bindir}/rx
|
||||
%{_bindir}/rz
|
||||
%{_bindir}/sb
|
||||
%{_bindir}/sx
|
||||
%{_bindir}/sz
|
||||
%{_bindir}/lrb
|
||||
%{_bindir}/lrx
|
||||
%{_bindir}/lrz
|
||||
%{_bindir}/lsb
|
||||
%{_bindir}/lsx
|
||||
%{_bindir}/lsz
|
||||
|
||||
%changelog
|
||||
Loading…
Reference in New Issue
Block a user