Run of fresh-releases for ypserv

Merge these changes:

git pull https://janitor.debian.net/git/ypserv fresh-releases/main
git pull https://janitor.debian.net/git/ypserv fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/ypserv fresh-releases/upstream

Summary

Merged new upstream version: 4.2 (was: 4.1).

Diff

Branch: main

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e08a675
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+# http://www.gnu.org/software/automake
+
+Makefile.in
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/aclocal.m4
+/compile
+/configure
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+
+# files generated by configure
+.deps
+.libs
+Makefile
+config.h
+config.h.in
+libnsl.pc
+*.o
+*.lo
+*.la
+*.a
+*~
+*.rej
+*.orig
+core
+config.log
+config.status
+libnsl-*.tar.bz2
+libnsl-*.tar.gz
+libtool
+po/POTFILES
+po/stamp-po
+po/remove-potcdate.sed
+
+# tar archive
+ypserv-*.tar.*
+*.8
+
+# some binaries
+lib/test-securenets
+makedbm/makedbm
+mknetid/mknetid
+revnetgroup/revnetgroup
+rpc.yppasswdd/rpc.yppasswdd
+rpc.ypxfrd/rpc.ypxfrd
+scripts/create_printcap
+scripts/match_printcap
+scripts/pwupdate
+scripts/ypMakefile
+scripts/ypinit
+scripts/ypxfr_1perday
+scripts/ypxfr_1perhour
+scripts/ypxfr_2perday
+yphelper/yphelper
+yppush/yppush
+ypserv/ypserv
+ypxfr/ypxfr
+lib/test-securenets.log
+lib/test-securenets.trs
+lib/test-suite.log
+lib/test-ypserv_conf
+lib/test-ypserv_conf.log
+lib/test-ypserv_conf.trs
+test-driver
diff --git a/NEWS b/NEWS
index a38e66d..90291e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 ypserv NEWS -- history of user-visible changes.
 
-Copyright (C) 1998-2019 Thorsten Kukuk
+Copyright (C) 1998-2021 Thorsten Kukuk
 
 Please send bug reports, questions and suggestions to <kukuk@thkukuk.de>.
 
+Version 4.2
+* Remove temporary files from yp_maplist
+
 Version 4.1
 * Bug fix release
 
diff --git a/configure.ac b/configure.ac
index 485a455..0cc06a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 #
-# Copyright (C) 1999-2019 Thorsten Kukuk <kukuk@thkukuk.de>
+# Copyright (C) 1999-2021 Thorsten Kukuk <kukuk@thkukuk.de>
 #
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ypserv],[4.1],[kukuk@thkukuk.de])
+AC_INIT([ypserv],[4.2],[kukuk@thkukuk.de])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ypserv/ypserv.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/debian/changelog b/debian/changelog
index e61d39f..594dc8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ypserv (4.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 15 May 2022 19:11:22 -0000
+
 ypserv (4.1-2) unstable; urgency=medium
 
   * Added Kerberos server as Suggests field. Fixed for ypbind-mt Suggests.
diff --git a/debian/patches/ypMakefile.in b/debian/patches/ypMakefile.in
index 119246f..060146a 100644
--- a/debian/patches/ypMakefile.in
+++ b/debian/patches/ypMakefile.in
@@ -1,6 +1,8 @@
---- a/scripts/ypMakefile.in
-+++ b/scripts/ypMakefile.in
-@@ -42,15 +42,15 @@
+Index: ypserv/scripts/ypMakefile.in
+===================================================================
+--- ypserv.orig/scripts/ypMakefile.in
++++ ypserv/scripts/ypMakefile.in
+@@ -42,15 +42,15 @@ MINGID=$(shell TMP=`egrep '^GID_MIN\s+[0
  
  # Should we merge the passwd file with the shadow file ?
  # MERGE_PASSWD=true|false
@@ -19,7 +21,7 @@
  MAKE = @MAKE@
  UMASK = umask 066
  
-@@ -107,11 +107,22 @@
+@@ -107,11 +107,22 @@ target: Makefile
  # If you don't want some of these maps built, feel free to comment
  # them out from this list.
  
diff --git a/ypserv/server.c b/ypserv/server.c
index f476ac3..e64ed8b 100644
--- a/ypserv/server.c
+++ b/ypserv/server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000-2016  Thorsten Kukuk
+/* Copyright (c) 2000-2016, 2021  Thorsten Kukuk
    Author: Thorsten Kukuk <kukuk@suse.de>
 
    The YP Server is free software; you can redistribute it and/or
@@ -1496,6 +1496,10 @@ ypproc_maplist_2_svc (domainname *argp, ypresp_maplist *result,
 	  /* ignore files starting with . */
 	  if (dep->d_name[0] == '.')
 	    continue;
+	  /* ignore temporary files ending with ~, created
+	     by makedbm and ypxfr if updating maps */
+	  if (dep->d_name[strlen(dep->d_name) - 1] == '~')
+	    continue;
 	  if (add_maplist (&result->list, dep->d_name) < 0)
 	    {
 	      result->status = YP_YPERR;

Branch: pristine-tar

diff --git a/ypserv_4.2.orig.tar.gz.delta b/ypserv_4.2.orig.tar.gz.delta
new file mode 100644
index 0000000..6411f59
Binary files /dev/null and b/ypserv_4.2.orig.tar.gz.delta differ
diff --git a/ypserv_4.2.orig.tar.gz.id b/ypserv_4.2.orig.tar.gz.id
new file mode 100644
index 0000000..3297919
--- /dev/null
+++ b/ypserv_4.2.orig.tar.gz.id
@@ -0,0 +1 @@
+25a07034aa9abe12c15e13e73aa52b9cfc5ad437

Branch: upstream

Tag: upstream/4.2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e08a675
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+# http://www.gnu.org/software/automake
+
+Makefile.in
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/aclocal.m4
+/compile
+/configure
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+
+# files generated by configure
+.deps
+.libs
+Makefile
+config.h
+config.h.in
+libnsl.pc
+*.o
+*.lo
+*.la
+*.a
+*~
+*.rej
+*.orig
+core
+config.log
+config.status
+libnsl-*.tar.bz2
+libnsl-*.tar.gz
+libtool
+po/POTFILES
+po/stamp-po
+po/remove-potcdate.sed
+
+# tar archive
+ypserv-*.tar.*
+*.8
+
+# some binaries
+lib/test-securenets
+makedbm/makedbm
+mknetid/mknetid
+revnetgroup/revnetgroup
+rpc.yppasswdd/rpc.yppasswdd
+rpc.ypxfrd/rpc.ypxfrd
+scripts/create_printcap
+scripts/match_printcap
+scripts/pwupdate
+scripts/ypMakefile
+scripts/ypinit
+scripts/ypxfr_1perday
+scripts/ypxfr_1perhour
+scripts/ypxfr_2perday
+yphelper/yphelper
+yppush/yppush
+ypserv/ypserv
+ypxfr/ypxfr
+lib/test-securenets.log
+lib/test-securenets.trs
+lib/test-suite.log
+lib/test-ypserv_conf
+lib/test-ypserv_conf.log
+lib/test-ypserv_conf.trs
+test-driver
diff --git a/NEWS b/NEWS
index a38e66d..90291e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 ypserv NEWS -- history of user-visible changes.
 
-Copyright (C) 1998-2019 Thorsten Kukuk
+Copyright (C) 1998-2021 Thorsten Kukuk
 
 Please send bug reports, questions and suggestions to <kukuk@thkukuk.de>.
 
+Version 4.2
+* Remove temporary files from yp_maplist
+
 Version 4.1
 * Bug fix release
 
diff --git a/configure.ac b/configure.ac
index 485a455..0cc06a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 #
-# Copyright (C) 1999-2019 Thorsten Kukuk <kukuk@thkukuk.de>
+# Copyright (C) 1999-2021 Thorsten Kukuk <kukuk@thkukuk.de>
 #
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ypserv],[4.1],[kukuk@thkukuk.de])
+AC_INIT([ypserv],[4.2],[kukuk@thkukuk.de])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ypserv/ypserv.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/ypserv/server.c b/ypserv/server.c
index f476ac3..e64ed8b 100644
--- a/ypserv/server.c
+++ b/ypserv/server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000-2016  Thorsten Kukuk
+/* Copyright (c) 2000-2016, 2021  Thorsten Kukuk
    Author: Thorsten Kukuk <kukuk@suse.de>
 
    The YP Server is free software; you can redistribute it and/or
@@ -1496,6 +1496,10 @@ ypproc_maplist_2_svc (domainname *argp, ypresp_maplist *result,
 	  /* ignore files starting with . */
 	  if (dep->d_name[0] == '.')
 	    continue;
+	  /* ignore temporary files ending with ~, created
+	     by makedbm and ypxfr if updating maps */
+	  if (dep->d_name[strlen(dep->d_name) - 1] == '~')
+	    continue;
 	  if (add_maplist (&result->list, dep->d_name) < 0)
 	    {
 	      result->status = YP_YPERR;

Publish Blockers

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases ypserv-dbgsymapt install -t fresh-releases ypserv

Lintian Result

Full worker log Full build log