Hello community,
here is the log from the commit of package tftp for openSUSE:Factory checked in
at 2020-10-26 16:12:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tftp (Old)
and /work/SRC/openSUSE:Factory/.tftp.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tftp"
Mon Oct 26 16:12:00 2020 rev:42 rq:843407 version:5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/tftp/tftp.changes 2020-10-03
18:55:22.769474114 +0200
+++ /work/SRC/openSUSE:Factory/.tftp.new.3463/tftp.changes 2020-10-26
16:12:32.586728922 +0100
@@ -1,0 +2,9 @@
+Tue Oct 13 11:00:10 UTC 2020 - Jan Engelhardt <jeng...@inai.de>
+
+- Do not suppress errors from useradd.
+- Replace some old specfile constructs. To that end, patches were
+ refreshed: tftp-hpa-0.43_include_sys_params.patch,
+ tftp-hpa-0.46_colon_check.patch, tftp-hpa-0.48-macros-crash.patch,
+ tftp-hpa-0.48-macros-v6mapped.patch.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tftp.spec ++++++
--- /var/tmp/diff_new_pack.BGywN7/_old 2020-10-26 16:12:34.394730586 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new 2020-10-26 16:12:34.398730590 +0100
@@ -58,15 +58,7 @@
component configuration files.
%prep
-%setup -q -n %{name}-hpa-%{version}
-%patch0
-%patch1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7
-%patch8
-%patch43 -p1
+%autosetup -p1 -n %{name}-hpa-%{version}
%build
autoreconf -fi
@@ -76,7 +68,7 @@
--with-tcpwrappers \
--with-remap \
--with-ipv6
-make %{?_smp_mflags}
+%make_build
%install
%make_install INSTALLROOT=%{buildroot} MANDIR="%{_mandir}"
@@ -92,10 +84,11 @@
# This group/user is shared with atftp, so please
# keep this in sync with atftp.spec
# add group
-%{_sbindir}/groupadd -r tftp 2>/dev/null || :
+getent group tftp >/dev/null || %{_sbindir}/groupadd -r tftp
# add user
-%{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp -g tftp \
- -r -s /bin/false tftp 2>/dev/null || :
+getent passwd tftp >/dev/null || \
+ %{_sbindir}/useradd -c "TFTP account" -d /srv/tftpboot -G tftp \
+ -g tftp -r -s /bin/false tftp
%service_add_pre %{name}.service %{name}.socket
++++++ tftp-hpa-0.43_include_sys_params.patch ++++++
--- /var/tmp/diff_new_pack.BGywN7/_old 2020-10-26 16:12:34.438730626 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new 2020-10-26 16:12:34.442730630 +0100
@@ -1,7 +1,11 @@
-Index: tftp/main.c
+---
+ tftp/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: tftp-hpa-5.2/tftp/main.c
===================================================================
---- tftp/main.c.orig
-+++ tftp/main.c
+--- tftp-hpa-5.2.orig/tftp/main.c
++++ tftp-hpa-5.2/tftp/main.c
@@ -39,6 +39,7 @@
* TFTP User Program -- Command Interface.
*/
++++++ tftp-hpa-0.46_colon_check.patch ++++++
--- /var/tmp/diff_new_pack.BGywN7/_old 2020-10-26 16:12:34.454730641 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new 2020-10-26 16:12:34.454730641 +0100
@@ -1,7 +1,11 @@
-Index: tftp/main.c
+---
+ tftp/main.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: tftp-hpa-5.2/tftp/main.c
===================================================================
---- tftp/main.c.orig
-+++ tftp/main.c
+--- tftp-hpa-5.2.orig/tftp/main.c
++++ tftp-hpa-5.2/tftp/main.c
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
bsd_signal(SIGINT, intr);
++++++ tftp-hpa-0.48-macros-crash.patch ++++++
--- /var/tmp/diff_new_pack.BGywN7/_old 2020-10-26 16:12:34.470730656 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new 2020-10-26 16:12:34.470730656 +0100
@@ -1,7 +1,12 @@
-diff -up tftpd/tftpd.c.orig-len tftpd/tftpd.c
---- tftpd/tftpd.c.orig-len 2012-12-11 16:31:29.658043427 +0100
-+++ tftpd/tftpd.c 2012-12-11 16:32:22.234018253 +0100
-@@ -1287,24 +1287,24 @@ static int rewrite_macros(char macro, ch
+---
+ tftpd/tftpd.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+Index: tftp-hpa-5.2/tftpd/tftpd.c
+===================================================================
+--- tftp-hpa-5.2.orig/tftpd/tftpd.c
++++ tftp-hpa-5.2/tftpd/tftpd.c
+@@ -1377,24 +1377,24 @@ static int rewrite_macros(char macro, ch
return strlen(p);
case 'x':
++++++ tftp-hpa-0.48-macros-v6mapped.patch ++++++
--- /var/tmp/diff_new_pack.BGywN7/_old 2020-10-26 16:12:34.478730663 +0100
+++ /var/tmp/diff_new_pack.BGywN7/_new 2020-10-26 16:12:34.482730667 +0100
@@ -1,7 +1,12 @@
-diff -up tftpd/tftpd.c.orig-v6map tftpd/tftpd.c
---- tftpd/tftpd.c.orig-v6map 2012-12-11 17:06:53.156624476 +0100
-+++ tftpd/tftpd.c 2012-12-11 17:13:08.705298341 +0100
-@@ -1263,6 +1263,21 @@ static void do_opt(const char *opt, cons
+---
+ tftpd/tftpd.c | 33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+Index: tftp-hpa-5.2/tftpd/tftpd.c
+===================================================================
+--- tftp-hpa-5.2.orig/tftpd/tftpd.c
++++ tftp-hpa-5.2/tftpd/tftpd.c
+@@ -1353,6 +1353,21 @@ static void do_opt(const char *opt, cons
#ifdef WITH_REGEX
@@ -23,7 +28,7 @@
/*
* This is called by the remap engine when it encounters macros such
* as \i. It should write the output in "output" if non-NULL, and
-@@ -1274,10 +1289,20 @@ static int rewrite_macros(char macro, ch
+@@ -1364,10 +1379,20 @@ static int rewrite_macros(char macro, ch
{
char *p, tb[INET6_ADDRSTRLEN];
int l=0;
@@ -45,7 +50,7 @@
tb, INET6_ADDRSTRLEN);
if (output && p)
strcpy(output, p);
-@@ -1287,14 +1312,14 @@ static int rewrite_macros(char macro, ch
+@@ -1377,14 +1402,14 @@ static int rewrite_macros(char macro, ch
return strlen(p);
case 'x':
