[arch-commits] Commit in autofs/repos/community-x86_64 (3 files)
Date: Monday, October 28, 2019 @ 14:28:02 Author: lfleischer Revision: 520851 archrelease: copy trunk to community-x86_64 Added: autofs/repos/community-x86_64/PKGBUILD (from rev 520850, autofs/trunk/PKGBUILD) Deleted: autofs/repos/community-x86_64/0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch autofs/repos/community-x86_64/PKGBUILD ---+ 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch | 553 PKGBUILD | 122 +- 2 files changed, 58 insertions(+), 617 deletions(-) Deleted: 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch === --- 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch 2019-10-28 14:27:55 UTC (rev 520850) +++ 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch 2019-10-28 14:28:02 UTC (rev 520851) @@ -1,553 +0,0 @@ -From ea79b481a37f29d72320fd16e6fa2cf035efb923 Mon Sep 17 00:00:00 2001 -From: Ian Kent -Date: Mon, 5 Feb 2018 09:05:24 +0800 -Subject: [PATCH] autofs-5.1.4 - account for recent libnsl changes - -The glibc RPC code has been dropped. - -The NIS functionality comes in the libnsl library but it installs -its files into sub directories of the system include and library -directories. - -So configure needs to check for this and allow for it in the -compile and linking of the NIS and NIS+ lookup modules. - -(cherry picked from commit 4ffced789c9f06c81e48a27a3402ace6bedcf4ab) - -# Conflicts: -# CHANGELOG - Makefile.conf.in| 4 +- - Makefile.rules | 2 - - aclocal.m4 | 45 +++ - configure | 288 +--- - configure.in| 27 ++--- - include/config.h.in | 3 + - modules/Makefile| 10 ++ - 7 files changed, 342 insertions(+), 37 deletions(-) - -diff --git a/Makefile.conf.in b/Makefile.conf.in -index f879e26..8566265 100644 a/Makefile.conf.in -+++ b/Makefile.conf.in -@@ -14,8 +14,8 @@ DAEMON_LDFLAGS = @DAEMON_LDFLAGS@ - # Glibc < 2.17 requires librt for clock_gettime() - LIBCLOCK_GETTIME = @LIBCLOCK_GETTIME@ - --# Special parameters for glibc (libc 6) --LIBNSL= @LIBNSL@ -+NSLLIB= @NSL_LIBS@ -+NSLCFLAGS = @NSL_CFLAGS@ - LIBRESOLV = @LIBRESOLV@ - - # Hesiod support: yes (1) no (0) -diff --git a/Makefile.rules b/Makefile.rules -index 0edf9bf..2bfa043 100644 a/Makefile.rules -+++ b/Makefile.rules -@@ -54,8 +54,6 @@ ifdef DMALLOCLIB - LIBS += $(DMALLOCLIB) - endif - --LIBS += $(LIBNSL) -- - LIBS += $(LIBCLOCK_GETTIME) - - # Standard rules -diff --git a/aclocal.m4 b/aclocal.m4 -index 5177204..f1ed387 100644 a/aclocal.m4 -+++ b/aclocal.m4 -@@ -417,3 +417,48 @@ fi - LIBS="$af_check_ldap_parse_page_control_save_libs" - ]) - -+dnl -- -+dnl AF_CHECK_YPCLNT_HEADER -+dnl -+dnl Check for include file rpcsvc/ypclnt.h for YellowPages support. -+dnl -- -+AC_DEFUN([AF_CHECK_YPCLNT_HEADER], -+[ -+# save current CFLAGS -+af_check_ypclnt_header_save_cflags="$CFLAGS" -+CFLAGS="$CFLAGS $NSL_CFLAGS $TIRPC_CFLAGS" -+ -+HAVE_YPCLNT=0 -+AC_CHECK_HEADER([rpcsvc/ypclnt.h], HAVE_YPCLNT=1) -+AC_SUBST(HAVE_YPCLNT) -+if test "$HAVE_YPCLNT" = "1"; then -+ AC_DEFINE(HAVE_YPCLNT, 1, -+ [Define if using YellowPages]) -+fi -+ -+# restore libs -+CFLAGS="$af_check_ypclnt_header_save_cflags" -+]) -+ -+dnl -- -+dnl AF_CHECK_NIS_HEADER -+dnl -+dnl Check for include file rpcsvc/nis.h for NIS+ support. -+dnl -- -+AC_DEFUN([AF_CHECK_NIS_HEADER], -+[ -+# save current CFLAGS -+af_check_nis_header_save_cflags="$CFLAGS" -+CFLAGS="$CFLAGS $NSL_CFLAGS $TIRPC_CFLAGS" -+ -+HAVE_NISPLUS=0 -+AC_CHECK_HEADER([rpcsvc/nis.h], HAVE_NISPLUS=1) -+AC_SUBST(HAVE_NISPLUS) -+if test "$HAVE_NISPLUS" = "1"; then -+ AC_DEFINE(HAVE_NISPLUS, 1, -+ [Define if using NIS+]) -+fi -+ -+# restore libs -+CFLAGS="$af_check_nis_header_save_cflags" -+]) -diff --git a/configure b/configure -index 476cea4..2d517aa 100755 a/configure -+++ b/configure -@@ -634,8 +634,8 @@ XML_FLAGS - LIBLDAP - HAVE_LDAP - LDAP_FLAGS --HAVE_YPCLNT - HAVE_NISPLUS -+HAVE_YPCLNT - EGREP - GREP - CPP -@@ -643,7 +643,8 @@ HESIOD_FLAGS - LIBHESIOD - HAVE_HESIOD - LIBRESOLV --LIBNSL -+NSL_LIBS -+NSL_CFLAGS - LIBCLOCK_GETTIME - KRB5_CONFIG - XML_CONFIG -@@ -764,6 +765,8 @@ CFLAGS - LDFLAGS - LIBS - CPPFLAGS -+NSL_CFLAGS -+NSL_LIBS - CPP' - - -@@ -1417,6 +1420,8 @@ Some influential environment variables: - LIBSlibraries to pass to the linker, e.g. -l - CPPFLAGS(Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory -+ NSL_CFLAGS C compiler flags for
[arch-commits] Commit in autofs/repos/community-x86_64 (3 files)
Date: Thursday, August 2, 2018 @ 23:44:13 Author: eschwartz Revision: 367475 archrelease: copy trunk to community-x86_64 Added: autofs/repos/community-x86_64/0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch (from rev 367474, autofs/trunk/0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch) autofs/repos/community-x86_64/PKGBUILD (from rev 367474, autofs/trunk/PKGBUILD) Deleted: autofs/repos/community-x86_64/PKGBUILD ---+ 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch | 553 PKGBUILD | 123 +- 2 files changed, 617 insertions(+), 59 deletions(-) Copied: autofs/repos/community-x86_64/0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch (from rev 367474, autofs/trunk/0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch) === --- 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch (rev 0) +++ 0001-autofs-5.1.4-account-for-recent-libnsl-changes.patch 2018-08-02 23:44:13 UTC (rev 367475) @@ -0,0 +1,553 @@ +From ea79b481a37f29d72320fd16e6fa2cf035efb923 Mon Sep 17 00:00:00 2001 +From: Ian Kent +Date: Mon, 5 Feb 2018 09:05:24 +0800 +Subject: [PATCH] autofs-5.1.4 - account for recent libnsl changes + +The glibc RPC code has been dropped. + +The NIS functionality comes in the libnsl library but it installs +its files into sub directories of the system include and library +directories. + +So configure needs to check for this and allow for it in the +compile and linking of the NIS and NIS+ lookup modules. + +(cherry picked from commit 4ffced789c9f06c81e48a27a3402ace6bedcf4ab) + +# Conflicts: +# CHANGELOG +--- + Makefile.conf.in| 4 +- + Makefile.rules | 2 - + aclocal.m4 | 45 +++ + configure | 288 +--- + configure.in| 27 ++--- + include/config.h.in | 3 + + modules/Makefile| 10 ++ + 7 files changed, 342 insertions(+), 37 deletions(-) + +diff --git a/Makefile.conf.in b/Makefile.conf.in +index f879e26..8566265 100644 +--- a/Makefile.conf.in b/Makefile.conf.in +@@ -14,8 +14,8 @@ DAEMON_LDFLAGS = @DAEMON_LDFLAGS@ + # Glibc < 2.17 requires librt for clock_gettime() + LIBCLOCK_GETTIME = @LIBCLOCK_GETTIME@ + +-# Special parameters for glibc (libc 6) +-LIBNSL= @LIBNSL@ ++NSLLIB= @NSL_LIBS@ ++NSLCFLAGS = @NSL_CFLAGS@ + LIBRESOLV = @LIBRESOLV@ + + # Hesiod support: yes (1) no (0) +diff --git a/Makefile.rules b/Makefile.rules +index 0edf9bf..2bfa043 100644 +--- a/Makefile.rules b/Makefile.rules +@@ -54,8 +54,6 @@ ifdef DMALLOCLIB + LIBS += $(DMALLOCLIB) + endif + +-LIBS += $(LIBNSL) +- + LIBS += $(LIBCLOCK_GETTIME) + + # Standard rules +diff --git a/aclocal.m4 b/aclocal.m4 +index 5177204..f1ed387 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -417,3 +417,48 @@ fi + LIBS="$af_check_ldap_parse_page_control_save_libs" + ]) + ++dnl -- ++dnl AF_CHECK_YPCLNT_HEADER ++dnl ++dnl Check for include file rpcsvc/ypclnt.h for YellowPages support. ++dnl -- ++AC_DEFUN([AF_CHECK_YPCLNT_HEADER], ++[ ++# save current CFLAGS ++af_check_ypclnt_header_save_cflags="$CFLAGS" ++CFLAGS="$CFLAGS $NSL_CFLAGS $TIRPC_CFLAGS" ++ ++HAVE_YPCLNT=0 ++AC_CHECK_HEADER([rpcsvc/ypclnt.h], HAVE_YPCLNT=1) ++AC_SUBST(HAVE_YPCLNT) ++if test "$HAVE_YPCLNT" = "1"; then ++ AC_DEFINE(HAVE_YPCLNT, 1, ++ [Define if using YellowPages]) ++fi ++ ++# restore libs ++CFLAGS="$af_check_ypclnt_header_save_cflags" ++]) ++ ++dnl -- ++dnl AF_CHECK_NIS_HEADER ++dnl ++dnl Check for include file rpcsvc/nis.h for NIS+ support. ++dnl -- ++AC_DEFUN([AF_CHECK_NIS_HEADER], ++[ ++# save current CFLAGS ++af_check_nis_header_save_cflags="$CFLAGS" ++CFLAGS="$CFLAGS $NSL_CFLAGS $TIRPC_CFLAGS" ++ ++HAVE_NISPLUS=0 ++AC_CHECK_HEADER([rpcsvc/nis.h], HAVE_NISPLUS=1) ++AC_SUBST(HAVE_NISPLUS) ++if test "$HAVE_NISPLUS" = "1"; then ++ AC_DEFINE(HAVE_NISPLUS, 1, ++ [Define if using NIS+]) ++fi ++ ++# restore libs ++CFLAGS="$af_check_nis_header_save_cflags" ++]) +diff --git a/configure b/configure +index 476cea4..2d517aa 100755 +--- a/configure b/configure +@@ -634,8 +634,8 @@ XML_FLAGS + LIBLDAP + HAVE_LDAP + LDAP_FLAGS +-HAVE_YPCLNT + HAVE_NISPLUS ++HAVE_YPCLNT + EGREP + GREP + CPP +@@ -643,7 +643,8 @@ HESIOD_FLAGS + LIBHESIOD + HAVE_HESIOD + LIBRESOLV +-LIBNSL ++NSL_LIBS ++NSL_CFLAGS + LIBCLOCK_GETTIME + KRB5_CONFIG + XML_CONFIG +@@ -764,6 +765,8 @@ CFLAGS + LDFLAGS + LIBS + CPPFLAGS ++NSL_CFLAGS ++NSL_LIBS + CPP' + + +@@ -1417,6 +1420,8 @@ Some influential environment variables: + LIBS
