Attachment 171238 Details for Bug 210129 – Update_to_1.3.14 ver2

[patch] Update_to_1.3.14 ver2

apcupsd-3.14.14-2.diff (text/plain), 4.92 KB, created by Leonid Nevecherya on 2016-06-09 18:06:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leonid Nevecherya

Created: 2016-06-09 18:06:57 UTC

Size: 4.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 416615)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	apcupsd
>-PORTVERSION=	3.14.13
>+PORTVERSION=	3.14.14
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 416615)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (apcupsd-3.14.13.tar.gz) = 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9
>-SIZE (apcupsd-3.14.13.tar.gz) = 1935043
>+TIMESTAMP = 1465490520
>+SHA256 (apcupsd-3.14.14.tar.gz) = db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867
>+SIZE (apcupsd-3.14.14.tar.gz) = 1843409
>Index: files/patch-autoconf_configure.in
>===================================================================
>--- files/patch-autoconf_configure.in	(nonexistent)
>+++ files/patch-autoconf_configure.in	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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" ],
>
>Property changes on: files/patch-autoconf_configure.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 416615)
>+++ files/patch-configure	(working copy)
>@@ -1,9 +1,28 @@
>---- configure.orig	2015-01-04 20:35:43 UTC
>+--- configure.orig	2016-04-18 20:26:31 UTC
> +++ configure
>-@@ -12678,53 +12678,6 @@ $as_echo "$as_me: error: gethostbyname_r
>+@@ -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
>+-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,
>@@ -50,7 +69,8 @@
> -      esac
> -      ;;
> -   esac
>+-fi
> -
>-    # See if GCC supports -fno-exceptions...
>-    { $as_echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5
>- $as_echo_n "checking if GCC supports -fno-exceptions... " >&6; }
>+ { $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
>Index: files/patch-src_apcnis.c
>===================================================================
>--- files/patch-src_apcnis.c	(nonexistent)
>+++ files/patch-src_apcnis.c	(working copy)
>@@ -0,0 +1,23 @@
>+--- 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;
>
>Property changes on: files/patch-src_apcnis.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 210129: 171194 | 171238 | 171424 | 171458