Attachment #171238 for bug #210129

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= apcupsd	4	PORTNAME= apcupsd
5	PORTVERSION= 3.14.13	5	PORTVERSION= 3.14.14
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
8		8

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (apcupsd-3.14.13.tar.gz) = 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9	1	TIMESTAMP = 1465490520
2	SIZE (apcupsd-3.14.13.tar.gz) = 1935043	2	SHA256 (apcupsd-3.14.14.tar.gz) = db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867
		3	SIZE (apcupsd-3.14.14.tar.gz) = 1843409




--- autoconf/configure.in.orig	2016-04-18 20:25:33 UTC
+++ autoconf/configure.in
@@ -431,7 +431,7 @@ AC_ARG_WITH(libwrap,
               int deny_severity = 0;
               int allow_severity = 0;
               struct request_info *req; ],
-            [ hosts_access(req); ],
+            [ hosts_access(); ],
             [ AC_MSG_RESULT([yes])
               AC_DEFINE(HAVE_LIBWRAP,, [Define if you have libwrap])
               TCPW_MSG="yes" ],
@@ -441,7 +441,7 @@ AC_ARG_WITH(libwrap,
                    int deny_severity = 0;
                    int allow_severity = 0;
                    struct request_info *req; ],
-                 [ hosts_access(req); ],
+                 [ hosts_access(); ],
                  [ AC_MSG_RESULT([yes])
                    AC_DEFINE(HAVE_LIBWRAP)
                    TCPW_MSG="yes" ],




--- configure.orig	2016-04-18 20:26:31 UTC
+++ configure
@@ -10591,7 +10591,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- hosts_access(req);
+ hosts_access();
   ;
   return 0;
 }
@@ -10643,7 +10643,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- hosts_access(req);
+ hosts_access();
   ;
   return 0;
 }
@@ -12397,55 +12397,6 @@ $as_echo "$as_me: error: gethostbyname_r
    ;;
 esac
 
-if test -n "$GCC"; then
-   # Starting with GCC 3.0, you must link C++ programs against either
-   # libstdc++ (shared by default), or libsupc++ (always static).  If
-   # you care about binary portability between Linux distributions,

-      esac
-      ;;
-   esac
-fi
-
 { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-exceptions" >&5
 $as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
 if test "${ax_cv_check_cflags___fno_exceptions+set}" = set; then




--- src/apcnis.c.orig	2015-03-20 03:59:41 UTC
+++ src/apcnis.c
@@ -317,16 +317,16 @@ int check_wrappers(char *av, int newsock
       av0 = av;
 
    request_init(&req, RQ_DAEMON, av0, RQ_FILE, newsock, NULL);
-   fromhost(&req);
+   fromhost();
 
-   if (!hosts_access(&req)) {
+   if (!hosts_access()) {
       log_event(core_ups, LOG_WARNING,
-         "Connection from %.500s refused by tcp_wrappers.", eval_client(&req));
+         "Connection from %.500s refused by tcp_wrappers.", eval_client());
       return FAILURE;
    }
 
 #ifdef I_WANT_LOTS_OF_LOGGING
-   log_event(core_ups, LOG_NOTICE, "connect from %.500s", eval_client(&req));
+   log_event(core_ups, LOG_NOTICE, "connect from %.500s", eval_client());
 #endif
 
    return SUCCESS;

Return to bug 210129

Line 0 Link Here

(-)files/patch-autoconf_configure.in (+20 lines)
	1	--- autoconf/configure.in.orig 2016-04-18 20:25:33 UTC
	2	+++ autoconf/configure.in
	3	@@ -431,7 +431,7 @@ AC_ARG_WITH(libwrap,
	4	int deny_severity = 0;
	5	int allow_severity = 0;
	6	struct request_info *req; ],
	7	- [ hosts_access(req); ],
	8	+ [ hosts_access(); ],
	9	[ AC_MSG_RESULT([yes])
	10	AC_DEFINE(HAVE_LIBWRAP,, [Define if you have libwrap])
	11	TCPW_MSG="yes" ],
	12	@@ -441,7 +441,7 @@ AC_ARG_WITH(libwrap,
	13	int deny_severity = 0;
	14	int allow_severity = 0;
	15	struct request_info *req; ],
	16	- [ hosts_access(req); ],
	17	+ [ hosts_access(); ],
	18	[ AC_MSG_RESULT([yes])
	19	AC_DEFINE(HAVE_LIBWRAP)
	20	TCPW_MSG="yes" ],

Lines 1-9 Link Here

(-)files/patch-configure (-6 / +26 lines)
1	--- configure.orig 2015-01-04 20:35:43 UTC	1	--- configure.orig 2016-04-18 20:26:31 UTC
2	+++ configure	2	+++ configure
3	@@ -12678,53 +12678,6 @@ $as_echo "$as_me: error: gethostbyname_r	3	@@ -10591,7 +10591,7 @@ cat >>conftest.$ac_ext <<_ACEOF
		4	int
		5	main ()
		6	{
		7	- hosts_access(req);
		8	+ hosts_access();
		9	;
		10	return 0;
		11	}
		12	@@ -10643,7 +10643,7 @@ cat >>conftest.$ac_ext <<_ACEOF
		13	int
		14	main ()
		15	{
		16	- hosts_access(req);
		17	+ hosts_access();
		18	;
		19	return 0;
		20	}
		21	@@ -12397,55 +12397,6 @@ $as_echo "$as_me: error: gethostbyname_r
		22	;;
4	esac	23	esac
5		24
6	if test -n "$GCC"; then	25	-if test -n "$GCC"; then
7	- # Starting with GCC 3.0, you must link C++ programs against either	26	- # Starting with GCC 3.0, you must link C++ programs against either
8	- # libstdc++ (shared by default), or libsupc++ (always static). If	27	- # libstdc++ (shared by default), or libsupc++ (always static). If
9	- # you care about binary portability between Linux distributions,	28	- # you care about binary portability between Linux distributions,
Lines 50-56 Link Here
50	- esac	69	- esac
51	- ;;	70	- ;;
52	- esac	71	- esac
		72	-fi
53	-	73	-
54	# See if GCC supports -fno-exceptions...	74	{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-exceptions" >&5
55	{ $as_echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5	75	$as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
56	$as_echo_n "checking if GCC supports -fno-exceptions... " >&6; }	76	if test "${ax_cv_check_cflags___fno_exceptions+set}" = set; then

Line 0 Link Here

(-)files/patch-src_apcnis.c (+23 lines)
	1	--- src/apcnis.c.orig 2015-03-20 03:59:41 UTC
	2	+++ src/apcnis.c
	3	@@ -317,16 +317,16 @@ int check_wrappers(char *av, int newsock
	4	av0 = av;
	5
	6	request_init(&req, RQ_DAEMON, av0, RQ_FILE, newsock, NULL);
	7	- fromhost(&req);
	8	+ fromhost();
	9
	10	- if (!hosts_access(&req)) {
	11	+ if (!hosts_access()) {
	12	log_event(core_ups, LOG_WARNING,
	13	- "Connection from %.500s refused by tcp_wrappers.", eval_client(&req));
	14	+ "Connection from %.500s refused by tcp_wrappers.", eval_client());
	15	return FAILURE;
	16	}
	17
	18	#ifdef I_WANT_LOTS_OF_LOGGING
	19	- log_event(core_ups, LOG_NOTICE, "connect from %.500s", eval_client(&req));
	20	+ log_event(core_ups, LOG_NOTICE, "connect from %.500s", eval_client());
	21	#endif
	22
	23	return SUCCESS;